Re: [PATCH] doc: pull: fix rebase=false documentation

Junio C Hamano wrote:

Felipe Contreras [off-list ref] writes:

quoted

quoted

But that does not necessarily mean swapping the parent order would
produce the history of a right shape, either, even for those with
the "first-parent chain is the trunk" worldview.

Why not?

I gave detailed write-up in two discussion threads linked already in
this thread from 2013 and 2014; as I said, I do not think we want to
debate that as part of the discussion of this documentation fix.

Sure, the discussion about the order of the parents is orthogonal to the
discussion of this particular documentation fix, but my comment that the
order of the parents is "obviously wrong" is correct. Even you said so
yourself in the 2013/2014 threads (I would gladly provide the links if
you require them).

I've spent several man-days re-reading the old threads (multiple times
even, and not just the ones from 2013/1014), and I just spent several
man-hours re-reading them yet again today.

My conclussion remains: the fact that the behavior is wrong is not
debatable (at least in some of the circumstances).

I will provide a summary in a different thread soon.

-- 
Felipe Contreras