rebase: protect against diff.renames configuration

diff --git a/git-rebase.sh b/git-rebase.sh
index ab4afa7dee377707484e7f76c7d44ac955f09397..386be43d995adf5550071deca0af9e25d2fcaedb 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -543,7 +543,7 @@ fi
 if test -z "$do_merge"
 then
        git format-patch -k --stdout --full-index --ignore-if-in-upstream \
-               $root_flag "$revisions" |
+               --no-renames $root_flag "$revisions" |
        git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
        move_to_original_branch
        ret=$?