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

Re: What's cooking in git.git (Apr 2012, #05; Thu, 12)

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

Possibly related (same subject, not in this thread)

On Mon, Apr 16, 2012 at 10:29 AM, Junio C Hamano [off-list ref] wrote:
I wonder if use of remoteheads later in the same function are correct,
though.  We equate "!remoteheads->next" and "We are not doing octopus",
for example.
I do think it would generally be a great idea to never use
"remoteheads" at all. An octopus merge that has been simplified to
just two parents isn't really an octopus merge any more.

So I think you're probably right - we should try to avoid using
remoteheads entirely, and any use is suspect

                 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