From: Junio C Hamano Date: Sun, 21 Dec 2008 02:37:11 GMT Subject: Re: [PATCH] Add a documentat on how to revert a faulty merge Message-ID: <7vocz6tfs8.fsf@gitster.siamese.dyndns.org> In-Reply-To: <200812201612.37455.bss@iguanasuicide.net> "Boyd Stephen Smith Jr." writes: > 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. The above follows the style of other files in Documentation/howto; if you look at the build procedure of howto-index, you will notice that some of these are required part of the documentation. > Also, your email gave me some errors from 'git am': > .dotest/patch:40: indent with spaces. > / That is "C program source" rules in action. I thought we had .gitattributes set up in Documentation/ area that applies different rules to these? Maybe they have not been tested with things in howto.