From: Nanako Shiraishi Date: Fri, 19 Dec 2008 21:45:32 GMT Subject: Re: Odd merge behaviour involving reverts Message-ID: <20081220064532.6117@nanako3.lavabit.com> In-Reply-To: <7vocz8a6zk.fsf@gitster.siamese.dyndns.org> Quoting Junio C Hamano : > I hope this clears up confusion and fear. You are correct that I misunderstood what Alan meant by corrected branch. 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. Thank you for your detailed response. -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/