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

Jonathan Nieder [off-list ref] writes:

Jonathan Nieder wrote:

quoted

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 <redacted>
---
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.

Junio C Hamano wrote:

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.

You thought correctly.  In this case I can't think of any change this
needs on top to make this real for inclusion so I just bumped the
thread.

There were two hints at improvements in this thread (separate topic):
the "git merge" manual could use some discussion of the distinction
between --renormalize and --ignore-whitespace-at-eol, and am, rebase,
stash, and "checkout -m <tree>" ought to have -X plumbed, too.