Merge branch 'vb/sendemail' into next

diff --git a/git-rebase.sh b/git-rebase.sh
index 6ff6088d187cfc54e0de0898fab555e7af319961..e6b57b8ab9595be2875f328c0a8b0f2f58897793 100755 (executable)
--- 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"