rebase --rebase-merges: root commits can be cousins, too

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 65a8c493781034aa9a5a5651cb4a1db06aa213a8..01e561bc20ec39587c6b4852c3deff9beb20a3f4 100644 (file)
--- 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;