git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/2] bash completion: Add completion for 'git mergetool'

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 15, 2008, 00:15 UTC
Message-ID
<7v63q3cev5.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20080815000541.GE3782@spearce.org>
"Shawn O. Pearce" <spearce@spearce.org> writes:
Show 11 quoted lines
> 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.

Previous: Shawn O. PearceNext: Shawn O. Pearce
Message 5 of 6 in “Helpful completions for merging”
  1. 0/2 Helpful completions for mergingLee Marlow, Aug 14, 2008
  2. 1/2 bash completion: Add completion for 'git mergetool'Lee Marlow, Aug 14, 2008
  3. 2/2 bash completion: Add '--merge' long option for 'git log'Lee Marlow, Aug 14, 2008
  4. Shawn O. PearceAug 15, 2008
  5. Junio C HamanoAug 15, 2008
  6. Shawn O. PearceAug 15, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.