diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-05-04 01:01:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-06 13:21:58 +0900 |
| commit | 8fa6eea0ffd271f0564048dc939987e9640efca5 (patch) | |
| tree | 0af599a25e6680e388b0bc623e14c184c91ea99a /sequencer.c | |
| parent | rebase --rebase-merges: a "merge" into a new root is a fast-forward (diff) | |
| download | git-8fa6eea0ffd271f0564048dc939987e9640efca5.tar.gz git-8fa6eea0ffd271f0564048dc939987e9640efca5.zip | |
rebase --rebase-merges: root commits can be cousins, too
Reported by Wink Saville: when rebasing with no-rebase-cousins, we
will want to refrain from rebasing all of them, even when they are
root commits.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 65a8c49378..01e561bc20 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3903,7 +3903,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, } if (!commit) - fprintf(out, "%s onto\n", cmd_reset); + fprintf(out, "%s %s\n", cmd_reset, + rebase_cousins ? "onto" : "[new root]"); else { const char *to = NULL; |