From: Boyd Stephen Smith Jr. Date: Sat, 20 Dec 2008 22:12:33 GMT Subject: Re: [PATCH] Add a documentat on how to revert a faulty merge Message-ID: <200812201612.37455.bss@iguanasuicide.net> In-Reply-To: <20081220202702.6117@nanako3.lavabit.com> On Saturday 2008 December 20 05:27:02 Nanako Shiraishi wrote: > +Date: Fri, 19 Dec 2008 00:45:19 -0800 > +From: Linus Torvalds , Junio C Hamano > +Subject: Re: Odd merge behaviour involving reverts > +Abstract: Sometimes a branch that was already merged to the mainline > + is later found to be faulty. Linus and Junio give guidance on > + recovering from such a premature merge and continuing development > + after the offending branch is fixed. > +Message-ID: <7vocz8a6zk.fsf@gitster.siamese.dyndns.org> > +References: > + > +Alan said: I don't like the email headers as part of the documentation. It would be better to have a title and abstract in prose. Also, your email gave me some errors from 'git am': .dotest/patch:40: indent with spaces. / .dotest/patch:57: indent with spaces. / .dotest/patch:91: indent with spaces. / .dotest/patch:103: indent with spaces. / .dotest/patch:110: indent with spaces. / / warning: squelched 3 whitespace errors warning: 8 lines add whitespace errors. Those errors aside, I think it's better formatted than what I had ready. I also think it would be nice to also modify the git-revert manpage to reference this documentation in the description on the -m option. -- Boyd Stephen Smith Jr. ,= ,-_-. =. bss@iguanasuicide.net ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' http://iguanasuicide.net/ \_/