diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:10:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:10:05 -0800 |
| commit | dabc42c7134596092bf59adb83c79b09f729c290 (patch) | |
| tree | 0e14f06997bf7a70cbcda9b1481b8295098b5f5e /git-rebase.sh | |
| parent | b59fd2098e6606e1a696fc1cafe897e074ed6d6f (diff) | |
| parent | 3041c324305e2bad59d7372336940846646dd46a (diff) | |
| download | git-dabc42c7134596092bf59adb83c79b09f729c290.tar.gz git-dabc42c7134596092bf59adb83c79b09f729c290.tar.xz | |
Merge branch 'jc/am'
* jc/am:
am: --rebasing
am: remove support for -d .dotest
am: read from the right mailbox when started from a subdirectory
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 6b9af962a..452c5e7e0 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -376,7 +376,7 @@ fi if test -z "$do_merge" then git format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD | - git am $git_am_opt --binary -3 -k --resolvemsg="$RESOLVEMSG" && + git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" && move_to_original_branch ret=$? test 0 != $ret -a -d .dotest && |