diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-12-11 00:51:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-28 19:27:56 (GMT) |
| commit | 67ac1e1d57e45899a4dfd900a0249f48507584b5 (patch) | |
| tree | 075c4365710ef649485d83a3ba7add0e04aaa4b1 /git-cvsexportcommit.perl | |
| parent | 73e7b2ef6c62b3ec345b557acb71a8da4798c70d (diff) | |
| download | git-67ac1e1d57e45899a4dfd900a0249f48507584b5.zip git-67ac1e1d57e45899a4dfd900a0249f48507584b5.tar.gz git-67ac1e1d57e45899a4dfd900a0249f48507584b5.tar.bz2 | |
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>
Diffstat (limited to 'git-cvsexportcommit.perl')
0 files changed, 0 insertions, 0 deletions