From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 03 Jun 2008 14:40:21 GMT
Subject: Re: Octopus merge: unique (?) to git, but is it useful?
Message-ID: <alpine.LFD.1.10.0806030738340.3473@woody.linux-foundation.org>
In-Reply-To: <7v3anv5fy3.fsf@gitster.siamese.dyndns.org>



On Mon, 2 Jun 2008, Junio C Hamano wrote:

> "Merge branches 'RELEASE' and 'fluff' into RELEASE"?  That happens if you
> are _on_ release branch and say "git merge release fluff".

Right. But git shouldn't do duplicate parents. I agree it's a mis-use of 
git merge, but either we should have errored out or we should have pruned 
the parents.

Yes, the end result is "tecnically correct", but it's not optimal.

		Linus