Merge branch 'sg/completion-no-column'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Dec 2015 18:59:06 +0000 (10:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Dec 2015 18:59:06 +0000 (10:59 -0800)
The completion script (in contrib/) used to list "git column"
(which is not an end-user facing command) as one of the choices

* sg/completion-no-column:
completion: remove 'git column' from porcelain commands

1  2 
contrib/completion/git-completion.bash
index d9b995799c6f86f23eded9ebbc955bccf2ebb76d,a795410915e6d08133285a19e9cbbc07daafa519..69568075191af7b22fc4e9e556cdcd3c19dc7a51
@@@ -664,10 -663,11 +664,11 @@@ __git_list_porcelain_commands (
                check-mailmap)    : plumbing;;
                check-ref-format) : plumbing;;
                checkout-index)   : plumbing;;
+               column)           : internal helper;;
                commit-tree)      : plumbing;;
                count-objects)    : infrequent;;
 -              credential-cache) : credentials helper;;
 -              credential-store) : credentials helper;;
 +              credential)       : credentials;;
 +              credential-*)     : credentials helper;;
                cvsexportcommit)  : export;;
                cvsimport)        : import;;
                cvsserver)        : daemon;;