Re: [RFC/PATCH] cherry-pick/revert: add support for -X/--strategy-option

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 28, 2010, 17:45 UTC
Message-ID: <7v7hetyeom.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20101227212515.GA32352@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

Show 18 quoted lines

> Jonathan Nieder wrote:
>
>> 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?
>
> Ping?  I use this with -Xpatience fairly often.  Am I the only one who
> has wanted such a thing?

Pong, if you are pinging me. I thought you wanted to only discuss it first with RFC and meant to follow up on a real-for-inclusion patch.

The goal stated in the proposed commit log is a good thing to have, and exactly the kind of thing -X<strategy option> interface was invented for in the first place, I think.

I didn't look at the code though.