diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:35 -0800 |
| commit | 06cd5a1e01328724b7709ac232e36263e59f5f26 (patch) | |
| tree | cd234c23f5d18c2e60ea61b33f1a6b98c08d8619 /contrib | |
| parent | f008159fc2dec7b98e74736751d3e6ad8d9c060f (diff) | |
| parent | 9512177b68263085fef84cdbd45ecdee7bfe2377 (diff) | |
| download | git-06cd5a1e01328724b7709ac232e36263e59f5f26.tar.gz git-06cd5a1e01328724b7709ac232e36263e59f5f26.tar.xz | |
Merge branch 'nd/rebase-forget'
"git rebase" learned "--quit" option, which allows a user to
remove the metadata left by an earlier "git rebase" that was
manually aborted without using "git rebase --abort".
* nd/rebase-forget:
rebase: add --quit to cleanup rebase, leave everything else untouched
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 21016bf8d..78fe5b7f5 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1734,10 +1734,10 @@ _git_rebase () { local dir="$(__gitdir)" if [ -f "$dir"/rebase-merge/interactive ]; then - __gitcomp "--continue --skip --abort --edit-todo" + __gitcomp "--continue --skip --abort --quit --edit-todo" return elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then - __gitcomp "--continue --skip --abort" + __gitcomp "--continue --skip --abort --quit" return fi __git_complete_strategy && return |