X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-rebase--am.sh;h=14c50782e096966b860d49cbaed7658e9f56958f;hb=daa8563143a311bbcf4187524d7178ed37c9dd9b;hp=6e64d40d6fb8fe1566dd26c3df534afe2278390c;hpb=5a80d1dd9c63dcc7d1a086797e9e8eb99cddffe0;p=thirdparty%2Fgit.git diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 6e64d40d6f..14c50782e0 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -53,6 +53,7 @@ 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" @@ -83,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=$?