diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:40:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:40:33 -0700 |
| commit | 0c61c6de3497900616b66a65dc41b27544131ed5 (patch) | |
| tree | 6042cc9ee4b7625f8c0281cea666ec167be10c1a | |
| parent | e3f213c7aff9e09b3bde7253a0a922467dd13671 (diff) | |
| parent | 5b220a6876f37d6c88d1d7a54ec115efc1e25255 (diff) | |
| download | git-0c61c6de3497900616b66a65dc41b27544131ed5.tar.gz | |
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
| -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 7508463b30..3335cee70b 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -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 |