| commit | 3041c324305e2bad59d7372336940846646dd46a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 4 Mar 2008 08:25:06 +0000 (4 00:25 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Mar 2008 18:52:56 +0000 (5 10:52 -0800) | ||
| tree | 7f15f79c52cc6b605d94c786b73e0fbbc3bca542 | treesnapshot (tar.gz zip) |
| parent | e72c74062c01855372add133fe8dcc0bd22bad20 | commitdiff |
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>
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>
| contrib/completion/git-completion.bash | diffblobblamehistory | |
| git-am.sh | diffblobblamehistory | |
| git-rebase.sh | diffblobblamehistory |