From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Jan 2016 22:02:45 +0000 (-0800)
Subject: Merge branch 'sg/completion-no-column' into maint
X-Git-Tag: v2.6.5~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34872f0b3c1d0054fe1981ad87b561a9e9b98c26;p=thirdparty%2Fgit.git

Merge branch 'sg/completion-no-column' into maint

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
---

34872f0b3c1d0054fe1981ad87b561a9e9b98c26
diff --cc contrib/completion/git-completion.bash
index 482ca84b45,a795410915..b383ed05c3
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -663,10 -663,11 +663,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;;