Skip to content

Commit

Permalink
Add --src/dst-prefix to git-formt-patch in git-rebase.sh
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Oded Shimon authored and Junio C Hamano committed Sep 10, 2010
1 parent 04df568 commit 5b220a6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5b220a6

Please sign in to comment.