diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-10 21:46:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 21:46:19 +0300 |
| commit | 6c083b7619f171d32df633ca0281653afabd788f (patch) | |
| tree | 1b1284680cfdfdee92314da6ea0978658bef24b1 /sequencer.h | |
| parent | 8463beaeb69fe0b7f651065813def4aa6827cd5d (diff) | |
| parent | 767a4ca648f8791c1fb623bd9f79fd8d7f026499 (diff) | |
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 'sequencer.h')
| -rw-r--r-- | sequencer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index d57d8ea23d..2088344cb3 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); |