Rework cvsexportcommit to handle binary files for all cases.

diff --git a/git-rebase.sh b/git-rebase.sh
index a7373c0532fad447263e7199d0b8ec2908c683c9..413636e2086a8c7274c0bc4cb04037f2e07f588e 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -286,7 +286,7 @@ fi
 
 if test -z "$do_merge"
 then
-       git-format-patch -k --stdout --full-index "$upstream"..ORIG_HEAD |
+       git-format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
        git am --binary -3 -k --resolvemsg="$RESOLVEMSG" \
                --reflog-action=rebase
        exit $?