diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-28 21:37:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-28 21:37:52 (GMT) |
| commit | c22c624a9de3576d6e66f81c3a1edc6dfcfb08bb (patch) | |
| tree | 0f8bdd53d9cad7b369c0e120cdff23bff40bdd27 /contrib | |
| parent | 2fc74f41c50562d76defa0617db5bcb7e5216272 (diff) | |
| parent | 65ed8ff376c4fdd8dd560b3ddbf7d6cd771f860e (diff) | |
| download | git-c22c624a9de3576d6e66f81c3a1edc6dfcfb08bb.zip git-c22c624a9de3576d6e66f81c3a1edc6dfcfb08bb.tar.gz git-c22c624a9de3576d6e66f81c3a1edc6dfcfb08bb.tar.bz2 | |
Merge branch 'nd/am-quit'
"git am" has learned the "--quit" option, in addition to the existing
"--abort" option; having the pair mirrors a few other commands like
"rebase" and "cherry-pick".
* nd/am-quit:
am: support --quit
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 88813e9..c7d5c7a 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1077,7 +1077,7 @@ _git_am () { __git_find_repo_path if [ -d "$__git_repo_path"/rebase-apply ]; then - __gitcomp "--skip --continue --resolved --abort" + __gitcomp "--skip --continue --resolved --abort --quit" return fi case "$cur" in |