summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-18 12:16:31 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-18 12:16:31 -0700
commit9c74b9440108c88802f656f2fad2e8950a4a7650 (patch)
treec5acfee167d5112fd2eb5c77628064bfb9593ce3 /git-rebase.sh
parentebb561bcfc7f04b3122150821dde7aca0356f00c (diff)
parent840b3ca758a42cb1481259521126ba2b02a5447a (diff)
downloadgit-9c74b9440108c88802f656f2fad2e8950a4a7650.tar.gz
Merge branch 'jn/rebase-rename-am'
* jn/rebase-rename-am: rebase: protect against diff.renames configuration t3400 (rebase): whitespace cleanup Teach "apply --index-info" to handle rename patches t4150 (am): futureproof against failing tests t4150 (am): style fix
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 1d38afdb10..1b9ea48cd7 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -544,7 +544,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=$?