From: Michael Rappazzo <rappazzo@gmail.com>
To: davvid@gmail.com, ssaasen@atlassian.com, john@keeping.me.uk,
gitster@pobox.com
Cc: git@vger.kernel.org, Michael Rappazzo <rappazzo@gmail.com>
Subject: [PATCH] mergetools: add config option to disable auto-merge
Date: Tue, 16 Jun 2015 17:35:13 -0400 [thread overview]
Message-ID: <1434490514-36204-1-git-send-email-rappazzo@gmail.com> (raw)
During conflict resolution, invoking a mergetool which supports
auto-merge will pass that option by default to the underlying tool.
This patch is intended to allow one to set 'merge.automerge' to
'false' in order to override this behavior.
Michael Rappazzo (1):
mergetools: add config option to disable auto-merge
Documentation/config.txt | 6 ++++++
Documentation/git-mergetool.txt | 19 +++++++++++++------
mergetools/araxis | 4 +++-
mergetools/diffmerge | 4 +++-
mergetools/kdiff3 | 4 +++-
5 files changed, 28 insertions(+), 9 deletions(-)
--
2.4.2
next reply other threads:[~2015-06-16 21:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 21:35 Michael Rappazzo [this message]
2015-06-16 21:35 ` [PATCH] mergetools: add config option to disable auto-merge Michael Rappazzo
2015-06-17 19:41 ` Junio C Hamano
2015-06-18 2:27 ` Mike Rappazzo
2015-06-18 8:42 ` David Aguilar
2015-06-18 15:14 ` Mike Rappazzo
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=1434490514-36204-1-git-send-email-rappazzo@gmail.com \
--to=rappazzo@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=ssaasen@atlassian.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).