From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Mar 2016 20:33:45 GMT
Subject: Re: [PATCH] merge: refuse to create too cool a merge by default
Message-ID: <xmqqoaabplue.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CA+55aFz7309BkfHjD5H7tp9WE0yf1VWncxfmB3hgimJ00fbT-Q@mail.gmail.com>

Linus Torvalds <torvalds@linux-foundation.org> writes:

> Mine was slightly different, I just went with a "unrelated" merge option.

Yeah, I was debating myself if this should be -Xunrelated specific
to recursive or an option that is meant for all strategies.  I can
go either way, but I think a command-wide option is logically the
right way to go, because you do not want two-project merge by
default no matter what strategy is used (and some of you may know
that I had a long term plan with no lines of code yet to do yet
another merge strategy).

> I'll attach my two patches anyway, if for no other reason than the
> fact that I actually wrote a new test for this.

Thanks, but after updating existing scripts, I think those changes
already make sure that two-project merges work with the option.
What is missing in my version is a new test that ensures the command
fails a two-project merge by default.