Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Re: Octopus merge: unique (?) to git, but is it useful?

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: 2016-06-15 22:44:40


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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help