All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Theodore Ts'o" <tytso@mit.edu>
To: Junio C Hamano <junkio@cox.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Please pull mergetool.git
Date: Sat, 29 Sep 2007 10:47:43 -0400	[thread overview]
Message-ID: <E1Ibdbb-0006Ep-NS@candygram.thunk.org> (raw)

Hi Junio,

Please pull from the "mergetool" branch at:
        git://repo.or.cz/git/mergetool.git mergetool

It contains the bug fixes for git mergetool discussed recently, and is
against the maint branch.   Thanks!

						- Ted

Junio C Hamano (1):
      Mergetool generating blank files (1.5.3)

Theodore Ts'o (2):
      mergetool: fix emerge when running in a subdirectory
      mergetool: Fix typo in options passed to kdiff3

             reply	other threads:[~2007-09-29 14:48 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-29 14:47 Theodore Ts'o [this message]
2007-09-29 22:43 ` Please pull mergetool.git Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2007-06-10 16:03 Theodore Ts'o
2007-06-10 19:55 ` Junio C Hamano
2007-06-10 21:31   ` Theodore Tso
2007-06-10 23:29   ` Brian Gernhardt
2007-06-11  1:02     ` Junio C Hamano
2007-06-11  1:55       ` Martin Langhoff
2007-06-11 13:31         ` Theodore Tso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1Ibdbb-0006Ep-NS@candygram.thunk.org \
    --to=tytso@mit.edu \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.