diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:19 -0700 |
| commit | 6c083b7619f171d32df633ca0281653afabd788f (patch) | |
| tree | 1b1284680cfdfdee92314da6ea0978658bef24b1 /builtin | |
| parent | The fourth batch (diff) | |
| parent | sequencer: advise if skipping cherry-picked commit (diff) | |
| download | tgif-6c083b7619f171d32df633ca0281653afabd788f.tar.xz | |
Merge branch 'js/advise-when-skipping-cherry-picked'
"git rebase" by default skips changes that are equivalent to
commits that are already in the history the branch is rebased onto;
give messages when this happens to let the users be aware of
skipped commits, and also teach them how to tell "rebase" to keep
duplicated changes.
* js/advise-when-skipping-cherry-picked:
sequencer: advise if skipping cherry-picked commit
Diffstat (limited to 'builtin')
| -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 6138009d6e..eb01f4d790 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: { |