Merge branch 'tk/apply-dev-null-verify-name-fix'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 88813e91244d820b4aa2c0fb5e60a44db03c3e59..c7d5c7af29a8e9595375a535af59549b01da1b49 100644 (file)
--- 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