From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 11 Dec 2010 02:35:37 GMT
Subject: Re: [RFC/PATCH] cherry-pick/revert: add support for -X/--strategy-option
Message-ID: <20101211023537.GA12161@burratino>
In-Reply-To: <7vvd319h50.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:

>> 	$ git revert -Xrenormalize old-problematic-commit
[...]
> I guess this can also take "ignore whitespace", which might be a better
> option for this particular use case?

Suppose in olden days you checked in files with \r\n line endings and
now you have switched to \n (attribute "crlf" or "text"), and in
between there was a day in which the line endings were switched.

Now you notice that old-problematic-commit is broken.  If that commit
removed lines (which had \r\n line endings), then even with
-Xignore-space-at-eol, "git revert" will add them back verbatim.  By
contrast, "git revert -Xrenormalize" would add them back in such a way
as to follow the current line ending style.