diff options
| author | Josh Steadmon <steadmon@google.com> | 2021-08-30 21:46:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 23:35:36 (GMT) |
| commit | 767a4ca648f8791c1fb623bd9f79fd8d7f026499 (patch) | |
| tree | a412a04463d6b0bb7e36fcdabe5512d539b89593 /sequencer.h | |
| parent | 2d755dfac9aadab25c3e025b849252b8c0a61465 (diff) | |
| download | git-767a4ca648f8791c1fb623bd9f79fd8d7f026499.zip git-767a4ca648f8791c1fb623bd9f79fd8d7f026499.tar.gz git-767a4ca648f8791c1fb623bd9f79fd8d7f026499.tar.bz2 | |
sequencer: advise if skipping cherry-picked commit
Silently skipping commits when rebasing with --no-reapply-cherry-picks
(currently the default behavior) can cause user confusion. Issue
warnings when this happens, as well as advice on how to preserve the
skipped commits.
These warnings and advice are displayed only when using the (default)
"merge" rebase backend.
Update the git-rebase docs to mention the warnings and advice.
Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index d57d8ea..2088344 100644 --- a/sequencer.h +++ b/sequencer.h @@ -156,6 +156,7 @@ int sequencer_remove_state(struct replay_opts *opts); */ #define TODO_LIST_ROOT_WITH_ONTO (1U << 6) #define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7) +#define TODO_LIST_WARN_SKIPPED_CHERRY_PICKS (1U << 8) int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, const char **argv, unsigned flags); |