Merge branch 'sg/completion-commit-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:51 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:51 +0000 (12:21 -0700)
* sg/completion-commit-cleanup:
completion: teach 'scissors' mode to 'git commit --cleanup='

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