diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-04 00:25:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-05 10:52:56 -0800 |
| commit | 3041c324305e2bad59d7372336940846646dd46a (patch) | |
| tree | 7f15f79c52cc6b605d94c786b73e0fbbc3bca542 /git-rebase.sh | |
| parent | e72c74062c01855372add133fe8dcc0bd22bad20 (diff) | |
| download | git-3041c324305e2bad59d7372336940846646dd46a.tar.gz | |
am: --rebasing
The new option --rebasing is used internally for rebase to tell am that
it is being used for its purpose. This would leave .dotest/rebasing to
help "completion" scripts tell if the ongoing operation is am or rebase.
Also the option at the same time stands for --binary, -3 and -k which
are always given when rebase drives am as its backend.
Using the information "am" leaves, git-completion.bash tells ongoing
rebase and am apart.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 6b9af962a9..452c5e7e01 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 && |