Jonathan Nieder 67ac1e1d57 cherry-pick/revert: add support for -X/--strategy-option ...

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>

2010-12-28 11:27:56 -08:00

4.6 KiB

Executable File

Raw Blame History

View Raw