From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 11 Dec 2010 02:29:15 GMT
Subject: Re: [RFC/PATCH] cherry-pick/revert: add support for -X/--strategy-option
Message-ID: <7vvd319h50.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20101211005144.GA6634@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> For example, this would allow cherry-picking or reverting patches from
> a piece of history with a different end-of-line style, like so:
>
> 	$ git revert -Xrenormalize old-problematic-commit
>
> Currently that is possible with manual use of merge-recursive but the
> cherry-pick/revert porcelain does not expose the functionality.
>
> While at it, document the existing support for --strategy.
>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
> Thoughts?

I guess this can also take "ignore whitespace", which might be a better
option for this particular use case?