Re: [PATCH] Make git revert warn the user when reverting a merge commit.

söndag 21 december 2008 04:11:13 skrev Boyd Stephen Smith Jr.:

On Saturday 2008 December 20 20:37:16 Junio C Hamano wrote:

quoted

Robin Rosenberg [off-list ref] writes:

quoted

An alternative, would be "removing changes relative to .."
(mainline).

But that is exactly what "This reverts commit X" means, isn't it?

When X is a merge commit, the phrase "the reverts commit X" is ambiguous.  Did 
you revert the tree to X^, X^2, or X^8?  I'd be fine with "This reverts 
commit X to X^y", but we definitely need some mention of X^y.

One could consider keeping the contributions from ^1 a special case and not
mention the parent, making it look like any revert commit. I guess most merge
reverts are like this in practice.

-- robin