summaryrefslogtreecommitdiff
path: root/sequencer.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-19 18:30:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-19 18:30:21 (GMT)
commitd97c62c828d6f0eb7ba7067c8c24793620900dd8 (patch)
tree53941cdc41e6ad573859ee63c570499b869fc967 /sequencer.h
parentb4b8c35729985a8f1f5e22f82259a2499efbc37a (diff)
parentdcb500dc16ce8db556b51e9a5b3fa977111d0443 (diff)
downloadgit-d97c62c828d6f0eb7ba7067c8c24793620900dd8.zip
git-d97c62c828d6f0eb7ba7067c8c24793620900dd8.tar.gz
git-d97c62c828d6f0eb7ba7067c8c24793620900dd8.tar.bz2
Merge branch 'ra/cherry-pick-revert-skip'
"git cherry-pick/revert" learned a new "--skip" action. * ra/cherry-pick-revert-skip: cherry-pick/revert: advise using --skip cherry-pick/revert: add --skip option sequencer: use argv_array in reset_merge sequencer: rename reset_for_rollback to reset_merge sequencer: add advice for revert
Diffstat (limited to 'sequencer.h')
-rw-r--r--sequencer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h
index 3d0b68c..6704acb 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -129,6 +129,7 @@ int sequencer_pick_revisions(struct repository *repo,
struct replay_opts *opts);
int sequencer_continue(struct repository *repo, struct replay_opts *opts);
int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
+int sequencer_skip(struct repository *repo, struct replay_opts *opts);
int sequencer_remove_state(struct replay_opts *opts);
#define TODO_LIST_KEEP_EMPTY (1U << 0)