author | Junio C Hamano <gitster@pobox.com> | |
Wed, 15 Sep 2010 19:40:33 +0000 (12:40 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 15 Sep 2010 19:40:33 +0000 (12:40 -0700) |
* os/fix-rebase-diff-no-prefix:
Add --src/dst-prefix to git-formt-patch in git-rebase.sh
Add --src/dst-prefix to git-formt-patch in git-rebase.sh
git-rebase.sh | patch | blob | history |
diff --git a/git-rebase.sh b/git-rebase.sh
index 7508463b30e7d1659ac9423a19d195e494600bd3..3335cee70b8ea5510f109da83d8470d3bbabab52 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
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