Merge branch 'os/fix-rebase-diff-no-prefix'

* os/fix-rebase-diff-no-prefix: Add --src/dst-prefix to git-formt-patch in git-rebase.sh
2010-09-15 12:40:33 -07:00 · 2010-09-15 12:40:33 -07:00 · 0c61c6de34
commit 0c61c6de34
parent e3f213c7af 5b220a6876
1 changed files with 1 additions and 0 deletions
--- a/git-rebase.sh
+++ b/git-rebase.sh
@ -566,6 +566,7 @@ fi
 if test -z "$do_merge"
 then
 	git format-patch -k --stdout --full-index --ignore-if-in-upstream \
+		--src-prefix=a/ --dst-prefix=b/ \
 		--no-renames $root_flag "$revisions" |
 	git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
 	move_to_original_branch