From: pudinha <rogi@skylittlesystem.org>
To: git@vger.kernel.org
Cc: pudinha <rogi@skylittlesystem.org>
Subject: [PATCH] Support nvim as mergetool
Date: Sat, 18 Jul 2020 20:20:02 +0100 [thread overview]
Message-ID: <20200718192001.27434-1-rogi@skylittlesystem.org> (raw)
---
Hello giters! Hope you are well!
I made this little patch to support nvim as a merge tool. What do you
think?
Best regards,
Pudinha <3
mergetools/nvimdiff | 1 +
mergetools/nvimdiff2 | 1 +
mergetools/nvimdiff3 | 1 +
mergetools/vimdiff | 9 ++++++---
4 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 mergetools/nvimdiff
create mode 100644 mergetools/nvimdiff2
create mode 100644 mergetools/nvimdiff3
diff --git a/mergetools/nvimdiff b/mergetools/nvimdiff
new file mode 100644
index 0000000000..04a5bb0ea8
--- /dev/null
+++ b/mergetools/nvimdiff
@@ -0,0 +1 @@
+. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/mergetools/nvimdiff2 b/mergetools/nvimdiff2
new file mode 100644
index 0000000000..04a5bb0ea8
--- /dev/null
+++ b/mergetools/nvimdiff2
@@ -0,0 +1 @@
+. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/mergetools/nvimdiff3 b/mergetools/nvimdiff3
new file mode 100644
index 0000000000..04a5bb0ea8
--- /dev/null
+++ b/mergetools/nvimdiff3
@@ -0,0 +1 @@
+. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 10d86f3e19..be559062ee 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -5,7 +5,7 @@ diff_cmd () {
merge_cmd () {
case "$1" in
- gvimdiff|vimdiff)
+ nvimdiff|gvimdiff|vimdiff)
if $base_present
then
"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
@@ -15,11 +15,11 @@ merge_cmd () {
"$LOCAL" "$MERGED" "$REMOTE"
fi
;;
- gvimdiff2|vimdiff2)
+ nvimdiff2|gvimdiff2|vimdiff2)
"$merge_tool_path" -f -d -c 'wincmd l' \
"$LOCAL" "$MERGED" "$REMOTE"
;;
- gvimdiff3|vimdiff3)
+ nvimdiff3|gvimdiff3|vimdiff3)
if $base_present
then
"$merge_tool_path" -f -d -c 'hid | hid | hid' \
@@ -34,6 +34,9 @@ merge_cmd () {
translate_merge_tool_path() {
case "$1" in
+ nvimdiff|nvimdiff2|nvimdiff3)
+ echo nvim
+ ;;
gvimdiff|gvimdiff2|gvimdiff3)
echo gvim
;;
--
2.27.0
next reply other threads:[~2020-07-18 19:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 19:20 pudinha [this message]
2020-07-18 20:30 ` [PATCH] Support nvim as mergetool Junio C Hamano
2020-07-19 4:23 ` [PATCH v2 0/2] Support nvim as merge tool pudinha
2020-07-29 21:31 ` [PATCH v3 0/2] mergetools: add support for nvimdiff (neovim) family pudinha
2020-07-29 21:31 ` [PATCH v3 1/2] mergetool--lib: improve support for vimdiff-style tool variants pudinha
2020-07-29 21:31 ` [PATCH v3 2/2] mergetools: add support for nvimdiff (neovim) family pudinha
2020-07-19 4:23 ` [PATCH v2 1/2] Refactor vimdiff and bc merge tool variants pudinha
2020-07-20 18:51 ` Junio C Hamano
2020-07-19 4:23 ` [PATCH v2 2/2] Support nvim as merge tool pudinha
2020-07-20 18:52 ` 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=20200718192001.27434-1-rogi@skylittlesystem.org \
--to=rogi@skylittlesystem.org \
--cc=git@vger.kernel.org \
/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).