[PATCH] Add --src/dst-prefix to git-formt-patch in git-rebase.sh
- From
- Oded Shimon <ods15@ods15.dyndns.org>
- Date
- Sep 9, 2010, 08:07 UTC
- Message-ID
- <1284019625-14096-1-git-send-email-ods15@ods15.dyndns.org>
- In-Reply-To
- <1283954045-8326-1-git-send-email-ods15@ods15.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 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh index 7508463..e83a0cf 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -565,7 +565,7 @@ fi if test -z "$do_merge" then - git format-patch -k --stdout --full-index --ignore-if-in-upstream \ + 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