diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 20:43:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 20:43:00 (GMT) |
| commit | d6d561db1c0a14e8b89149694c0c662096c5fc9d (patch) | |
| tree | d0180fa78b9b0c5d4c03e843686cdffcac8647e2 /sequencer.h | |
| parent | c7d8f69da5443788950b823bd6b9b663e1e686a3 (diff) | |
| parent | 0fcb4f6b62c87a73971890070dea847b56176338 (diff) | |
| download | git-d6d561db1c0a14e8b89149694c0c662096c5fc9d.zip git-d6d561db1c0a14e8b89149694c0c662096c5fc9d.tar.gz git-d6d561db1c0a14e8b89149694c0c662096c5fc9d.tar.bz2 | |
Merge branch 'jt/rebase-allow-duplicate'
Allow "git rebase" to reapply all local commits, even if the may be
already in the upstream, without checking first.
* jt/rebase-allow-duplicate:
rebase --merge: optionally skip upstreamed commits
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h index 04c5c31..9611605 100644 --- a/sequencer.h +++ b/sequencer.h @@ -150,7 +150,7 @@ int sequencer_remove_state(struct replay_opts *opts); * `--onto`, we do not want to re-generate the root commits. */ #define TODO_LIST_ROOT_WITH_ONTO (1U << 6) - +#define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7) int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, const char **argv, unsigned flags); |