X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-rebase.sh;h=1b9ea48cd713d7f6b25e529d09743447635f6432;hb=af6c6e0b19dc396849e7e09727044ba1a725e811;hp=2d88742cecc5037b945b5e01fba0674177ab6a74;hpb=c01a29c74ff991faf3012882fbf676b182b8893f;p=git.git

diff --git a/git-rebase.sh b/git-rebase.sh
index 2d88742ce..1b9ea48cd 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -346,7 +346,7 @@ do
 	--root)
 		rebase_root=t
 		;;
-	-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
+	-f|--f|--fo|--for|--forc|--force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
 		force_rebase=t
 		;;
 	--rerere-autoupdate|--no-rerere-autoupdate)
@@ -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=$?