From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Seth House <seth@eseth.com>, git@vger.kernel.org
Cc: pudinha <rogi@skylittlesystem.org>,
David Aguilar <davvid@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 0/1] mergetools/vimdiff: add vimdiff1 merge tool variant
Date: Thu, 25 Feb 2021 13:45:16 -0500 [thread overview]
Message-ID: <b3467a47-dffd-154f-76f9-e09b8145a5e5@gmail.com> (raw)
In-Reply-To: <20210214022840.849312-1-seth@eseth.com>
Hi Seth,
Le 2021-02-13 à 21:28, Seth House a écrit :
> Add yet another vimdiff layout variant to present the simplest possible
> two-way diff when resolving conflicts.
>
> The name is an attempt at UNIX-style humor -- vimdiff3 opens four
> buffers and vimdiff2 opens three buffers so vimdiff1 should therefore
> open two buffers. It also communicates that vimdiff will be used and
> fits cleanly into the existing layout variant naming. That said,
> suggestions welcome if that isn't as great a fit as I think it is. :)
I like the name :P Slightly orthogonal though, when I first looked
at the output of 'git mergetool --tool-help', I was sort of confused by
vimdiff2 and vimdiff3 (and some others) because I looked for them in PATH and (of course)
could not find them, still Git was telling me they were available.
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)
Cheers,
Philippe.
next prev parent reply other threads:[~2021-02-25 18:46 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 ` Philippe Blain [this message]
2021-02-26 0:29 ` [PATCH 0/1] " Seth House
2021-02-26 2:04 ` Junio C Hamano
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=b3467a47-dffd-154f-76f9-e09b8145a5e5@gmail.com \
--to=levraiphilippeblain@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).