From: Boyd Stephen Smith Jr. Date: Sun, 21 Dec 2008 03:11:13 GMT Subject: Re: [PATCH] Make git revert warn the user when reverting a merge commit. Message-ID: <200812202111.17831.bss@iguanasuicide.net> In-Reply-To: <7viqpetfs3.fsf@gitster.siamese.dyndns.org> On Saturday 2008 December 20 20:37:16 Junio C Hamano wrote: > Robin Rosenberg writes: > > 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. -- Boyd Stephen Smith Jr. ,= ,-_-. =. bss@iguanasuicide.net ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' http://iguanasuicide.net/ \_/