Re: [BUG] git-merge-octopus creates an empty merge commit with one parent

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [BUG] git-merge-octopus creates an empty merge commit with one parent

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:04

Michał Kiedrowicz [off-list ref] writes:
... Except that I still think this behavior is not correct.
Well, what was missing from my "don't do it then" quote was "Doctor it
HURTS when I do this."; there is no question that it is not correct if it
hurts ;-).

Patches welcome; I suspect it shouldn't be too intrusive or difficult.

Re: [BUG] git-merge-octopus creates an empty merge commit with one parent

From: Michał Kiedrowicz <hidden>
Date: 2016-06-15 22:53:04

Junio C Hamano <gitster <at> pobox.com> writes:
Well, what was missing from my "don't do it then" quote was "Doctor it
HURTS when I do this."; there is no question that it is not correct if it
hurts .
All right :)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help