From: Lars Hjemli <hjemli@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH 0/2] add support for per branch merge policy
Date: Thu, 20 Sep 2007 14:53:07 +0200 [thread overview]
Message-ID: <1190292789-16203-1-git-send-email-hjemli@gmail.com> (raw)
These two patches extends git-merge with the options --ff and --no-ff,
and uses the configuration setting branch.<name>.integrationonly to
select the default policy per branch (it obviously defaults to --ff), as
mentioned in http://article.gmane.org/gmane.comp.version-control.git/41980
This can also be used as a clean solution to the problem related to
fast-forward merges between git-svn tracking branches, especially if
git-svn could be taught to set integrationonly=true on all relevant
branches whenever this setting is undefined.
Diffstat:
Documentation/config.txt | 7 +++
Documentation/git-svn.txt | 17 ++++++
Documentation/merge-options.txt | 13 +++++
git-merge.sh | 30 ++++++++++-
t/t6029-merge-integration.sh | 108 +++++++++++++++++++++++++++++++++++++++
5 files changed, 172 insertions(+), 3 deletions(-)
next reply other threads:[~2007-09-20 12:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-20 12:53 Lars Hjemli [this message]
2007-09-20 12:53 ` [PATCH 1/2] git-merge: add option --no-ff Lars Hjemli
2007-09-20 12:53 ` [PATCH 2/2] add support for branch.<name>.integrationonly Lars Hjemli
2007-09-20 13:14 ` Johannes Schindelin
2007-09-20 13:36 ` Matthieu Moy
2007-09-20 13:07 ` [PATCH 0/2] add support for per branch merge policy Lars Hjemli
2007-09-20 13:24 ` Johannes Schindelin
2007-09-20 13:38 ` Lars Hjemli
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=1190292789-16203-1-git-send-email-hjemli@gmail.com \
--to=hjemli@gmail.com \
--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.
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).