From: Junio C Hamano <gitster@pobox.com>
To: Seth House <seth@eseth.com>
Cc: Philippe Blain <levraiphilippeblain@gmail.com>,
git@vger.kernel.org, pudinha <rogi@skylittlesystem.org>,
David Aguilar <davvid@gmail.com>
Subject: Re: [PATCH 0/1] mergetools/vimdiff: add vimdiff1 merge tool variant
Date: Thu, 25 Feb 2021 18:04:53 -0800 [thread overview]
Message-ID: <xmqqh7lzshx6.fsf@gitster.g> (raw)
In-Reply-To: <YDhBAPbU/T8BldrS@ellen.lan> (Seth House's message of "Thu, 25 Feb 2021 17:29:52 -0700")
Seth House <seth@eseth.com> writes:
> 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.
next prev parent reply other threads:[~2021-02-26 2:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-14 2:28 [PATCH 0/1] mergetools/vimdiff: add vimdiff1 merge tool variant Seth House
2021-02-14 2:28 ` [PATCH 1/1] " Seth House
2021-02-16 18:38 ` Junio C Hamano
2021-02-23 18:55 ` David Aguilar
2021-02-25 16:02 ` Seth House
2021-02-25 18:45 ` [PATCH 0/1] " Philippe Blain
2021-02-26 0:29 ` Seth House
2021-02-26 2:04 ` Junio C Hamano [this message]
2021-02-26 23:35 ` Seth House
2021-02-27 1:52 ` Junio C Hamano
2021-02-27 2:17 ` Seth House
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=xmqqh7lzshx6.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=levraiphilippeblain@gmail.com \
--cc=rogi@skylittlesystem.org \
--cc=seth@eseth.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.