mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'os/fix-rebase-diff-no-prefix'
* os/fix-rebase-diff-no-prefix: Add --src/dst-prefix to git-formt-patch in git-rebase.sh
This commit is contained in:
commit
0c61c6de34
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue