Keep all info in command-list.txt in git binary

index 2659153cb3..91f7eaed7b 100644
@@ -1343,6 +1343,16 @@ credential.<url>.*::
 credentialCache.ignoreSIGHUP::
 	Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting.
 
+completion.commands::
+	This is only used by git-completion.bash to add or remove
+	commands from the complete list. Normally only porcelain
+	commands and a few select others are in the complete list. You
+	can add more commands, separated by space, in this
+	variable. Prefixing a command with '-' will remove it from
+	the existing list.
++
+This variable should not be per-repository.
+
 include::diff-config.txt[]
 
 difftool.<tool>.path::

index 0fd29803d5..f7ca9a4d4f 100644
@@ -50,10 +50,10 @@
 #
 #         GIT_COMPLETION_CMD_GROUPS=main,others
 #
-#     Or you could go with defaults add some extra commands specified
-#     in the configuration variable completion.commands [1] with
+#     Or you could go with main porcelain only and extra commands in
+#     the configuration variable completion.commands with
 #
-#         GIT_COMPLETION_CMD_GROUPS=mainporcelain,others,list-complete,config
+#         GIT_COMPLETION_CMD_GROUPS=mainporcelain,config
 #
 #     Or go completely custom group with
 #

@@ -61,15 +61,6 @@
 #
 #     Or you could even play with other command categories found in
 #     command-list.txt.
-#
-#     [1] Note that completion.commands should not be per-repository
-#         since the command list is generated once and cached.
-#
-#         completion.commands could be used to exclude commands as
-#         well.  If a command in this list begins with '-', then it
-#         will be excluded from the list of commands gathered by the
-#         groups specified before "config" in
-#         $GIT_COMPLETION_CMD_GROUPS.
 
 case "$COMP_WORDBREAKS" in
 *:*) : great ;;

@@ -876,7 +867,7 @@ __git_commands () {
 		then
 			git --list-cmds="$GIT_COMPLETION_CMD_GROUPS"
 		else
-			git --list-cmds=list-mainporcelain,others,list-complete
+			git --list-cmds=list-mainporcelain,others,list-complete,config
 		fi
 		;;
 	all)

index bfd8ef0671..8d6d8b45ce 100755
@@ -9,7 +9,7 @@ command_list () {
 	grep -v '^#' "$1"
 }
 
-get_categories() {
+get_categories () {
 	tr ' ' '\n'|
 	grep -v '^$' |
 	sort |

@@ -32,7 +32,7 @@ get_synopsis () {
 		}' "Documentation/$1.txt"
 }
 
-define_categories() {
+define_categories () {
 	echo
 	echo "/* Command categories */"
 	bit=0

@@ -45,7 +45,7 @@ define_categories() {
 	test "$bit" -gt 32 && die "Urgh.. too many categories?"
 }
 
-define_category_names() {
+define_category_names () {
 	echo
 	echo "/* Category names */"
 	echo "static const char *category_names[] = {"

@@ -60,7 +60,7 @@ define_category_names() {
 	echo "};"
 }
 
-print_command_list() {
+print_command_list () {
 	echo "static struct cmdname_help command_list[] = {"
 
 	command_list "$1" |