From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Yaroslav Halchenko <yoh@onerussian.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Joey Hess <id@joeyh.name>
Subject: [PATCH 0/4] Loosening "two project merge" safety
Date: Thu, 21 Apr 2016 12:24:56 -0700 [thread overview]
Message-ID: <20160421192500.23563-1-gitster@pobox.com> (raw)
Yaroslav Halchenko gave a vague "forcing 'git merge' users to always
give --allow-unrelated-histories option when they create crap/insane
merges are not nice", which I couldn't guess the validity due to
lack of concrete use case. Just in case it is substantiated, here
is a series to selectively and safely loosen the safety for specific
use cases and users.
Junio C Hamano (4):
t3033: avoid 'ambiguous refs' warning
pull: pass --allow-unrelated-histories to "git merge"
merge: GIT_MERGE_ALLOW_UNRELATED_HISTORIES environment
merge: introduce merge.allowUnrelatedhistories configuration option
Documentation/git-merge.txt | 14 +-------------
Documentation/git.txt | 7 +++++++
Documentation/merge-config.txt | 7 +++++++
Documentation/merge-options.txt | 8 ++++++++
builtin/merge.c | 6 ++++++
builtin/pull.c | 11 +++++++++++
t/t3033-merge-toplevel.sh | 31 ++++++++++++++++++++++++++++++-
t/t5521-pull-options.sh | 28 ++++++++++++++++++++++++++++
8 files changed, 98 insertions(+), 14 deletions(-)
--
2.8.1-422-g6d9b748
next reply other threads:[~2016-04-21 19:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-21 19:24 Junio C Hamano [this message]
2016-04-21 19:24 ` [PATCH 1/4] t3033: avoid 'ambiguous refs' warning Junio C Hamano
2016-04-21 19:24 ` [PATCH 2/4] pull: pass --allow-unrelated-histories to "git merge" Junio C Hamano
2016-04-21 19:36 ` Stefan Beller
2016-04-21 21:32 ` Junio C Hamano
2016-04-21 19:24 ` [PATCH 3/4] merge: GIT_MERGE_ALLOW_UNRELATED_HISTORIES environment Junio C Hamano
2016-04-21 19:25 ` [PATCH 4/4] merge: introduce merge.allowUnrelatedhistories configuration option Junio C Hamano
2016-04-21 22:29 ` [PATCH 0/4] Loosening "two project merge" safety 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=20160421192500.23563-1-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=id@joeyh.name \
--cc=torvalds@linux-foundation.org \
--cc=yoh@onerussian.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).