From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: pudinha <rogi@skylittlesystem.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 0/2] difftool: fix user-defined Beyond Compare setups
Date: Wed, 11 Nov 2020 20:33:16 +0000 [thread overview]
Message-ID: <pull.787.git.1605126798.gitgitgadget@gmail.com> (raw)
Git v2.29.0 includes patches that try to support Beyond Compare better by
default. However, as reported in
https://github.com/git-for-windows/git/issues/2893, they broke user-defined
setups that use bc4 as the name for the difftool.
This patch series fixes that and is based on pd/mergetool-nvimdiff.
Johannes Schindelin (2):
mergetools/bc: add `bc4` to the alias list for Beyond Compare
mergetool: avoid letting `list_tool_variants` break user-defined
setups
git-mergetool--lib.sh | 4 ++++
mergetools/bc | 1 +
2 files changed, 5 insertions(+)
base-commit: 11868978c7c80d3c29071b29e7964e3d62523819
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-787%2Fdscho%2Ffix-beyond-compare-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-787/dscho/fix-beyond-compare-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/787
--
gitgitgadget
next reply other threads:[~2020-11-11 20:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-11 20:33 Johannes Schindelin via GitGitGadget [this message]
2020-11-11 20:33 ` [PATCH 1/2] mergetools/bc: add `bc4` to the alias list for Beyond Compare Johannes Schindelin via GitGitGadget
2020-11-11 20:33 ` [PATCH 2/2] mergetool: avoid letting `list_tool_variants` break user-defined setups Johannes Schindelin via GitGitGadget
2020-11-11 20:59 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.787.git.1605126798.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=rogi@skylittlesystem.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.
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.