diff options
| author | Oded Shimon <ods15@ods15.dyndns.org> | 2010-09-09 21:49:51 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-09 17:09:44 -0700 |
| commit | 5b220a6876f37d6c88d1d7a54ec115efc1e25255 (patch) | |
| tree | 98683b1f433ccc61ddfd43704fb05babb7c7d846 | |
| parent | 04df568be53c42d07aea393effc7c5653f245d9a (diff) | |
| download | git-5b220a6876f37d6c88d1d7a54ec115efc1e25255.tar.gz | |
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>
| -rwxr-xr-x | git-rebase.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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 |