rebase --rebase-merges: a "merge" into a new root is a fast-forward

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index e29da6343392d59f1999c486137b12bbb50e7382..2f4941d0fc95270f0b723eaed8f69d506ee69a27 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -894,6 +894,8 @@ init_revisions_and_shortrevisions () {
        else
                revisions=$onto...$orig_head
                shortrevisions=$shorthead
+               test -z "$squash_onto" ||
+               echo "$squash_onto" >"$state_dir"/squash-onto
        fi
 }
 
@@ -948,7 +950,7 @@ EOF
        die "Could not skip unnecessary pick commands"
 
        checkout_onto
-       if test -z "$rebase_root" && test ! -d "$rewritten"
+       if test ! -d "$rewritten"
        then
                require_clean_work_tree "rebase"
                exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \
@@ -971,6 +973,7 @@ git_rebase__interactive () {
 
        git rebase--helper --make-script ${keep_empty:+--keep-empty} \
                ${rebase_merges:+--rebase-merges} \
+               ${rebase_cousins:+--rebase-cousins} \
                $revisions ${restrict_revision+^$restrict_revision} >"$todo" ||
        die "$(gettext "Could not generate todo list")"