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

Re: [PATCH 0/1] mergetools/vimdiff: add vimdiff1 merge tool variant

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 26, 2021, 02:04 UTC
Message-ID
<xmqqh7lzshx6.fsf@gitster.g>
In-Reply-To
<YDhBAPbU/T8BldrS@ellen.lan>
Seth House <seth@eseth.com> writes:
Show 22 quoted lines
> On Thu, Feb 25, 2021 at 01:45:16PM -0500, Philippe Blain wrote:
>> I think it would be good to add a short note about these variants somewhere
>> in Documentation/git-mergetool.txt. Might be in this patch, or not if you don't
>> feel like it...
>> 
>> Going further, we could even add a short (few words) description of each tool
>> and have that description show up in the output of  'git mergetool --tool-help',
>> something like this:
>> 
>> $ git mergetool --tool-help
>> 'git mergetool --tool=<tool>' may be set to one of the following:
>> 		emerge		Emacs (Emerge)
>> 		opendiff	Apple FileMerge
>> 		vimdiff		Vim (??)
>> 		vimdiff2	Vim (3 panes)
>> 		vimdiff3	Vim (4 panes)
>
> Great suggestions, thanks. A little explanation would be very helpful --
> I've been confused by those variants too and wondered why I might want
> to use one over another.
>
> I'll roll those into this patch.
I'd rather see it as a completely separate patch.
Previous: Seth HouseNext: Seth House
Message 8 of 11 in “mergetools/vimdiff: add vimdiff1 merge tool variant”
  1. 0/1 mergetools/vimdiff: add vimdiff1 merge tool variantSeth House, Feb 14, 2021
  2. 1/1 mergetools/vimdiff: add vimdiff1 merge tool variantSeth House, Feb 14, 2021
  3. Junio C HamanoFeb 16, 2021
  4. David AguilarFeb 23, 2021
  5. Seth HouseFeb 25, 2021
  6. Philippe BlainFeb 25, 2021
  7. Seth HouseFeb 26, 2021
  8. Junio C HamanoFeb 26, 2021
  9. Seth HouseFeb 26, 2021
  10. Junio C HamanoFeb 27, 2021
  11. Seth HouseFeb 27, 2021

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.