Merge branch 'ml/submodule-add-existing'

diff --git a/git-rebase.sh b/git-rebase.sh
index 6b9af962a9cee734510518e82cf2537441ed843a..452c5e7e01e168ec4fcdc5bb87caac3f326f95ea 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -376,7 +376,7 @@ fi
 if test -z "$do_merge"
 then
        git format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
-       git am $git_am_opt --binary -3 -k --resolvemsg="$RESOLVEMSG" &&
+       git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
        move_to_original_branch
        ret=$?
        test 0 != $ret -a -d .dotest &&