From: Junio C Hamano <gitster@pobox.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Lee Marlow <lee.marlow@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 1/2] bash completion: Add completion for 'git mergetool'
Date: Thu, 14 Aug 2008 17:15:58 -0700 [thread overview]
Message-ID: <7v63q3cev5.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080815000541.GE3782@spearce.org> (Shawn O. Pearce's message of "Thu, 14 Aug 2008 17:05:41 -0700")
"Shawn O. Pearce" <spearce@spearce.org> writes:
> Lee Marlow <lee.marlow@gmail.com> wrote:
>> The --tool= long option can be completed with
>> kdiff3 tkdiff meld xxdiff emerge
>> vimdiff gvimdiff ecmerge opendiff
>>
>> Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
>
> Acked-by: Shawn O. Pearce <spearce@spearce.org>
>
> ... for both patches in this series. But this is new functionality
> so it probably won't be in 1.6.0; its too late in that release cycle.
Heh, you are too cautious ;-)
Both "log --merge" and mergetool have been with us for quite some time,
and I certainly do not mind taking [2/2] if not both.
next prev parent reply other threads:[~2008-08-15 0:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-14 22:41 [PATCH 0/2] Helpful completions for merging Lee Marlow
2008-08-14 22:41 ` [PATCH 1/2] bash completion: Add completion for 'git mergetool' Lee Marlow
2008-08-14 22:41 ` [PATCH 2/2] bash completion: Add '--merge' long option for 'git log' Lee Marlow
2008-08-15 0:05 ` [PATCH 1/2] bash completion: Add completion for 'git mergetool' Shawn O. Pearce
2008-08-15 0:15 ` Junio C Hamano [this message]
2008-08-15 0:18 ` Shawn O. Pearce
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=7v63q3cev5.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=lee.marlow@gmail.com \
--cc=spearce@spearce.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).