From: Junio C Hamano Date: Sun, 21 Dec 2008 22:46:45 GMT Subject: Re: [PATCH] Make git revert warn the user when reverting a merge commit. Message-ID: <7vd4flkuy2.fsf@gitster.siamese.dyndns.org> In-Reply-To: <200812212340.46375.robin.rosenberg.lists@dewire.com> Robin Rosenberg writes: > 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. Ok. >> + add_to_msg(",\nreverting damages made to %s"); > maybe "changes" is more neutrral language. I also think you break > the line too early. The above (without %s which shouldn't have been there) would give: This reverts commit efe05b019ca19328d27c07ef32b4698a7f36166f, reverting damages made to ec9f0ea3e6ecf1237223dec8428e7bb73d339320. Do you want: This reverts commit efe05b019ca19328d27c07ef32b4698a7f36166f, reversing changes made to ec9f0ea3e6ecf1237223dec8428e7bb73d339320. this instead?