From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Aug 2008 00:15:58 GMT
Subject: Re: [PATCH 1/2] bash completion: Add completion for 'git mergetool'
Message-ID: <7v63q3cev5.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080815000541.GE3782@spearce.org>

"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.