aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--am.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-rebase--am.sh')
-rw-r--r--git-rebase--am.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 6e64d40d6..14c50782e 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=$?