diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-12-10 18:51:44 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-28 11:27:56 -0800 |
| commit | 67ac1e1d57e45899a4dfd900a0249f48507584b5 (patch) | |
| tree | 075c4365710ef649485d83a3ba7add0e04aaa4b1 /merge-recursive.h | |
| parent | 73e7b2ef6c62b3ec345b557acb71a8da4798c70d (diff) | |
| download | git-67ac1e1d57e45899a4dfd900a0249f48507584b5.tar.gz | |
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 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index c8135b0ec7..981ed6ac94 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -57,6 +57,8 @@ struct tree *write_tree_from_memory(struct merge_options *o); int parse_merge_opt(struct merge_options *out, const char *s); /* builtin/merge.c */ -int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes); +int try_merge_command(const char *strategy, size_t xopts_nr, + const char **xopts, struct commit_list *common, + const char *head_arg, struct commit_list *remotes); #endif |