diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2017-01-23 23:52:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-25 14:49:32 -0800 |
| commit | b614cad4fcacd4728defd86d84da85e374aef4a9 (patch) | |
| tree | 53531df9db2bf5975dedb3bc1e2011d9e44df6a6 /sequencer.h | |
| parent | 7581b5118a715b9e882ea156fbe6d81d9180e911 (diff) | |
| download | git-gb/cherry-pick-skip.tar.gz | |
sequencer: allow to --skip current commitgb/cherry-pick-skip
If a sequencing gets interrupted (by a conflict or an empty commit or
whatever), the user can now opt to just skip it passing the `--skip`
command line option, which acts like a `--continue`, except that the
current commit gets skipped.
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h index f8b8bd0063..afc4bb4e6c 100644 --- a/sequencer.h +++ b/sequencer.h @@ -41,7 +41,7 @@ struct replay_opts { #define REPLAY_OPTS_INIT { -1 } int sequencer_pick_revisions(struct replay_opts *opts); -int sequencer_continue(struct replay_opts *opts); +int sequencer_continue(struct replay_opts *opts, char cmd); int sequencer_rollback(struct replay_opts *opts); int sequencer_remove_state(struct replay_opts *opts); |