From: pudinha <rogi@skylittlesystem.org>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, pudinha <rogi@skylittlesystem.org>
Subject: [PATCH v3 0/2] mergetools: add support for nvimdiff (neovim) family
Date: Wed, 29 Jul 2020 22:31:11 +0100 [thread overview]
Message-ID: <20200729213113.15927-1-rogi@skylittlesystem.org> (raw)
In-Reply-To: <20200719042335.3913-1-rogi@skylittlesystem.org>
Junio,
thanks for your time. I think I addressed all your comments regarding
the commit messages. One of them is a bit long, but I saw some others
are too and I'd rather have it long than not descriptive enough.
Please, let me know if anything else needs changing.
Best regards
pudinha (2):
mergetool--lib: improve support for vimdiff-style tool variants
mergetools: add support for nvimdiff (neovim) family
contrib/completion/git-completion.bash | 4 +--
git-mergetool--lib.sh | 35 ++++++++++++++++++++------
mergetools/bc | 5 ++++
mergetools/bc3 | 1 -
mergetools/gvimdiff3 | 1 -
mergetools/{gvimdiff2 => nvimdiff} | 0
mergetools/vimdiff | 21 ++++++++++++----
mergetools/vimdiff2 | 1 -
mergetools/vimdiff3 | 1 -
9 files changed, 51 insertions(+), 18 deletions(-)
delete mode 100644 mergetools/bc3
delete mode 100644 mergetools/gvimdiff3
rename mergetools/{gvimdiff2 => nvimdiff} (100%)
delete mode 100644 mergetools/vimdiff2
delete mode 100644 mergetools/vimdiff3
--
2.28.0
next prev parent reply other threads:[~2020-07-29 21:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 19:20 [PATCH] Support nvim as mergetool pudinha
2020-07-18 20:30 ` Junio C Hamano
2020-07-19 4:23 ` [PATCH v2 0/2] Support nvim as merge tool pudinha
2020-07-29 21:31 ` pudinha [this message]
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=20200729213113.15927-1-rogi@skylittlesystem.org \
--to=rogi@skylittlesystem.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).