From: Fernando Ramos <greenfoo@u92.eu>
To: git@vger.kernel.org
Cc: gitster@pobox.com, seth@eseth.com, levraiphilippeblain@gmail.com,
rogi@skylittlesystem.org
Subject: Re: [RFC PATCH] mergetools/vimdiff: add vimdiff4 merge tool variant
Date: Wed, 20 Oct 2021 00:12:48 +0200 [thread overview]
Message-ID: <YW9C4KvsXSQOCX/w@zacax395.localdomain> (raw)
In-Reply-To: <20211019212020.25385-1-greenfoo@u92.eu>
On 21/10/19 11:20PM, Fernando Ramos wrote:
> This new vimdiff4 variant of the merge-tool opens three tabs...
>
One reason why this RFC should *not* be merged is that the same functionality
can be achieved right now by simply adding these two lines to
"~/.config/git/config":
[mergetool "vimdiff4"]
cmd = vim -f -d -c \"4wincmd w | wincmd J | tabnew | edit $LOCAL | vertical diffsplit $BASE | tabnew | edit $REMOTE | vertical diffsplit $BASE | 2tabprevious\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true
On the other hand, one reason to merge it is that this new windows/tabs
arrangement is so useful when solving complex merges, that it would be nice to
have it available by default for easier discoverablility.
Let me know what you think :)
next prev parent reply other threads:[~2021-10-19 22:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-19 21:20 [RFC PATCH] mergetools/vimdiff: add vimdiff4 merge tool variant Fernando Ramos
2021-10-19 22:12 ` Fernando Ramos [this message]
2021-10-24 22:54 ` David Aguilar
2021-10-25 18:18 ` Junio C Hamano
2021-10-25 20:13 ` Fernando Ramos
2021-10-27 16:46 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YW9C4KvsXSQOCX/w@zacax395.localdomain \
--to=greenfoo@u92.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).