diff options
| author |  Josh Steadmon <steadmon@google.com> | 2021-08-30 14:46:02 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:35:36 -0700 |
| commit | 767a4ca648f8791c1fb623bd9f79fd8d7f026499 (patch) | |
| tree | a412a04463d6b0bb7e36fcdabe5512d539b89593 /builtin/rebase.c | |
| parent | Git 2.33-rc1 (diff) | |
| download | tgif-767a4ca648f8791c1fb623bd9f79fd8d7f026499.tar.xz | |
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 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 33e0961900..db2342c732 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -405,6 +405,7 @@ static int run_sequencer_rebase(struct rebase_options *opts, flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0; flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0; flags |= opts->reapply_cherry_picks ? TODO_LIST_REAPPLY_CHERRY_PICKS : 0; + flags |= opts->flags & REBASE_NO_QUIET ? TODO_LIST_WARN_SKIPPED_CHERRY_PICKS : 0; switch (command) { case ACTION_NONE: { |