rebase -i: introduce --recreate-merges=[no-]rebase-cousins

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index cfe3a537ac210a96919590e70c022fb263dd1ea2..e199fe1cca569fa03a7afc90c40342580169788c 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -903,6 +903,7 @@ if test t != "$preserve_merges"
 then
        git rebase--helper --make-script ${keep_empty:+--keep-empty} \
                ${recreate_merges:+--recreate-merges} \
+               ${rebase_cousins:+--rebase-cousins} \
                $revisions ${restrict_revision+^$restrict_revision} >"$todo" ||
        die "$(gettext "Could not generate todo list")"
 else