From 5b220a6876f37d6c88d1d7a54ec115efc1e25255 Mon Sep 17 00:00:00 2001 From: Oded Shimon Date: Thu, 9 Sep 2010 21:49:51 +0300 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-rebase.sh b/git-rebase.sh index 1b9ea48cd7..acca22dc78 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -544,6 +544,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 -- 2.11.4.GIT