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
git-mirror · Sep 15, 2010 · 0c61c6d · 0c61c6d
2 parents e3f213c + 5b220a6
commit 0c61c6d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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