X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-rebase.sh;h=e6b57b8ab9595be2875f328c0a8b0f2f58897793;hp=6ff6088d187cfc54e0de0898fab555e7af319961;hb=HEAD;hpb=94cdb382583e7c87d949fb22754d795a1b956377 diff --git a/git-rebase.sh b/git-rebase.sh index 6ff6088d..e6b57b8a 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -152,6 +152,6 @@ then exit 0 fi -git-format-patch -k --stdout --full-index "$upstream" ORIG_HEAD | +git-format-patch -k --stdout --full-index "$upstream"..ORIG_HEAD | git am --binary -3 -k --resolvemsg="$RESOLVEMSG"