From: Robin Rosenberg Date: Sun, 21 Dec 2008 22:40:45 GMT Subject: Re: [PATCH] Make git revert warn the user when reverting a merge commit. Message-ID: <200812212340.46375.robin.rosenberg.lists@dewire.com> In-Reply-To: <7vprjlkwbb.fsf@gitster.siamese.dyndns.org> söndag 21 december 2008 23:17:12 skrev Junio C Hamano: > From: Robin Rosenberg > Subject: git-revert: record the parent against which a revert was made > > As described in Documentation/howto/revert-a-faulty-merge.txt, re-merging > from a previously reverted a merge of a side branch may need a revert of > the revert beforehand. Record against which parent the revert was made in > the commit, so that later the user can figure out what went on. > > [jc: original had the logic in the message reversed, so I tweaked it.] No need for this comment. > + add_to_msg(",\nreverting damages made to %s"); maybe "changes" is more neutrral language. I also think you break the line too early. Are we done now? -- robin