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.c | |
| 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.c')
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index ce28cad..f30bb73 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4852,12 +4852,13 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, int keep_empty = flags & TODO_LIST_KEEP_EMPTY; const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick"; int rebase_merges = flags & TODO_LIST_REBASE_MERGES; + int reapply_cherry_picks = flags & TODO_LIST_REAPPLY_CHERRY_PICKS; repo_init_revisions(r, &revs, NULL); revs.verbose_header = 1; if (!rebase_merges) revs.max_parents = 1; - revs.cherry_mark = 1; + revs.cherry_mark = !reapply_cherry_picks; revs.limited = 1; revs.reverse = 1; revs.right_only = 1; |