Merge branch 'sg/completion-commit-cleanup' into maint

* sg/completion-commit-cleanup:
completion: teach 'scissors' mode to 'git commit --cleanup='

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index eae9dce590e0000eb93e441106ef6538c07e86cc..3b1a9b1d4f60819a4009a320e0dde107ebab8365 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1114,7 +1114,7 @@ _git_commit ()
 
        case "$cur" in
        --cleanup=*)
-               __gitcomp "default strip verbatim whitespace
+               __gitcomp "default scissors strip verbatim whitespace
                        " "" "${cur##--cleanup=}"
                return
                ;;