summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-04 22:02:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-04 22:02:47 (GMT)
commit34872f0b3c1d0054fe1981ad87b561a9e9b98c26 (patch)
treee8c6231c370ee0351c08dc0238132712d8bbc997
parent1ff88560c8d22bcdb528a6629239d638f927cb96 (diff)
parent160fcdb0075ac458d77876234e46147ce503a9b7 (diff)
downloadgit-34872f0b3c1d0054fe1981ad87b561a9e9b98c26.zip
git-34872f0b3c1d0054fe1981ad87b561a9e9b98c26.tar.gz
git-34872f0b3c1d0054fe1981ad87b561a9e9b98c26.tar.bz2
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
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 482ca84..b383ed0 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -663,6 +663,7 @@ __git_list_porcelain_commands ()
check-mailmap) : plumbing;;
check-ref-format) : plumbing;;
checkout-index) : plumbing;;
+ column) : internal helper;;
commit-tree) : plumbing;;
count-objects) : infrequent;;
credential) : credentials;;