Re: Odd merge behaviour involving reverts

Nanako Shiraishi [off-list ref] writes:

I think your explanation will help people if we make it part of the
documentation.  Especially because two different cases need two
different recovery methods, and people need to learn which is which.

Sure.  It needs copyediting to make it readable standalone by not
mentioning "your misunderstanding", inlining "earlier Linus's suggestion",
etc., though.

Patches welcome ;-)

Quoting Junio C Hamano [off-list ref]:

Nanako Shiraishi [off-list ref] writes:

quoted

I think your explanation will help people if we make it part of the
documentation.  Especially because two different cases need two
different recovery methods, and people need to learn which is which.

Sure.  It needs copyediting to make it readable standalone by not
mentioning "your misunderstanding", inlining "earlier Linus's suggestion",
etc., though.

Patches welcome ;-)

Okay, I'll send one later.

Thanks.
-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/