unpack-trees: oneway_merge to update submodules

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 319933e70a34f9da4ec93d063eb102eff33b6787..14c50782e096966b860d49cbaed7658e9f56958f 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -53,6 +53,8 @@ else
 
        git format-patch -k --stdout --full-index --cherry-pick --right-only \
                --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
+               --pretty=mboxrd \
+               $git_format_patch_opt \
                "$revisions" ${restrict_revision+^$restrict_revision} \
                >"$GIT_DIR/rebased-patches"
        ret=$?
@@ -82,6 +84,7 @@ else
        fi
 
        git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
+               --patch-format=mboxrd \
                $allow_rerere_autoupdate \
                ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
        ret=$?