Skip to content

Commit 5b220a6

Browse files
Oded Shimongitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 04df568 commit 5b220a6

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

git-rebase.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,7 @@ fi
544544
if test -z "$do_merge"
545545
then
546546
git format-patch -k --stdout --full-index --ignore-if-in-upstream \
547+
--src-prefix=a/ --dst-prefix=b/ \
547548
--no-renames $root_flag "$revisions" |
548549
git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
549550
move_to_original_branch

0 commit comments

Comments
 (0)