From: Oded Shimon <ods15@ods15.dyndns.org>
Date: Thu, 09 Sep 2010 18:49:51 GMT
Subject: [PATCH] Add --src/dst-prefix to git-formt-patch in git-rebase.sh
Message-ID: <1284058191-15831-1-git-send-email-ods15@ods15.dyndns.org>
In-Reply-To: <7vbp86n4t4.fsf@alter.siamese.dyndns.org>

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>
---
 git-rebase.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index 7508463..3335cee 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
-- 
1.6.4.4