cherry-pick/revert: add support for -X/--strategy-option
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 11 Dec 2010 00:51:44 +0000 (18:51 -0600)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 19:27:56 +0000 (11:27 -0800)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found