From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Yaroslav Halchenko <debian@onerussian.com>,
Miklos Vajna <vmiklos@frugalware.org>
Subject: [PATCH 0/2] set NO_TRIVIAL for custom merge strategies
Date: Sun, 15 Aug 2010 20:06:52 -0500 [thread overview]
Message-ID: <20100816010652.GA22546@burratino> (raw)
As noticed at <http://bugs.debian.org/581691>, the example custom
“theirs” strategy does not take effect for trivial merges.
A user-defined “ours”-like strategy would also not be possible without
this change.
Longer term, it would be nice to be able to override the
NO_FAST_FORWARD and NO_TRIVIAL flags for custom strategies in
~/.gitconfig, but let’s wait until we need it.
Thoughts?
Jonathan Nieder (2):
t7606 (merge-theirs): modernize style
merge: let custom strategies intervene in trivial merges
builtin/merge.c | 1 +
t/t7606-merge-custom.sh | 96 ++++++++++++++++++++++++++++++++++-------------
2 files changed, 71 insertions(+), 26 deletions(-)
next reply other threads:[~2010-08-16 1:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-16 1:06 Jonathan Nieder [this message]
2010-08-16 1:08 ` [PATCH 1/2] t7606 (merge-theirs): modernize style Jonathan Nieder
2010-08-16 1:11 ` [PATCH 2/2] merge: let custom strategies intervene in trivial merges Jonathan Nieder
2010-08-16 3:39 ` 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=20100816010652.GA22546@burratino \
--to=jrnieder@gmail.com \
--cc=debian@onerussian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vmiklos@frugalware.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 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).