From: Junio C Hamano Date: Mon, 21 Dec 2015 18:59:06 +0000 (-0800) Subject: Merge branch 'sg/completion-no-column' X-Git-Tag: v2.7.0-rc2~7 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d78cba4b8f127002d368a032b112b2ba8619f693 Merge branch 'sg/completion-no-column' 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 --- d78cba4b8f127002d368a032b112b2ba8619f693 diff --cc contrib/completion/git-completion.bash index d9b995799c,a795410915..6956807519 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@@ -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;;