Junio C Hamano <gitster@pobox.com> wrote:
quoted text
> "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 ;-)

Heh, last time you accused me of being too aggressive.
 
quoted text
> 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.

I think both are fine to include in 1.6.0 if you are willing to
apply them there.  Its pretty low risk, but at this point the
bash completion has gone from "minor fun toy" to "major part of
the git-core suite which all of the distros link into their bash
completion loading".  IMHO its long out-grown its contrib status.

-- 
Shawn.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html