Add --src/dst-prefix to git-formt-patch in git-rebase.sh
For the case of "diff.noprefix" in git-config, git-format-patch should still output diff with standard prefixes for git-am Signed-off-by: Oded Shimon <ods15@ods15.dyndns.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Oded Shimon committed
Sep 9, 2010 at 21:49 UTC
5b220a6876f37d6c88d1d7a54ec115efc1e25255
1 file changed
+1
git-rebase.sh
+1
@@ -544,6 +544,7 @@ fi
544
if test -z "$do_merge"
545
then
546
git format-patch -k --stdout --full-index --ignore-if-in-upstream \
547
+ --src-prefix=a/ --dst-prefix=b/ \
548
--no-renames $root_flag "$revisions" |
549
git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
550
move_to_original_branch