X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=3335cee70b8ea5510f109da83d8470d3bbabab52;hb=e7cf4e94c6f147953af4d079ca2e9ef0d7a29ae9;hp=7508463b30e7d1659ac9423a19d195e494600bd3;hpb=d25c72f7da5116f7b7a1f88a59d2bc14415a03b2;p=git.git

diff --git a/git-rebase.sh b/git-rebase.sh
index 7508463b3..3335cee70 100755
--- 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