| commit | 67ac1e1d57e45899a4dfd900a0249f48507584b5 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Sat, 11 Dec 2010 00:51:44 +0000 (10 18:51 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Dec 2010 19:27:56 +0000 (28 11:27 -0800) | ||
| tree | 075c4365710ef649485d83a3ba7add0e04aaa4b1 | treesnapshot (tar.gz zip) |
| parent | 73e7b2ef6c62b3ec345b557acb71a8da4798c70d | commitdiff |
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>
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>