Merge branch 'nd/command-list'

The list of commands with their various attributes were spread
across a few places in the build procedure, but it now is getting a
bit more consolidated to allow more automation.

* nd/command-list:
  completion: allow to customize the completable command list
  completion: add and use --list-cmds=alias
  completion: add and use --list-cmds=nohelpers
  Move declaration for alias.c to alias.h
  completion: reduce completable command list
  completion: let git provide the completable command list
  command-list.txt: documentation and guide line
  help: use command-list.txt for the source of guides
  help: add "-a --verbose" to list all commands with synopsis
  git: support --list-cmds=list-<category>
  completion: implement and use --list-cmds=main,others
  git --list-cmds: collect command list in a string_list
  git.c: convert --list-* to --list-cmds=*
  Remove common-cmds.h
  help: use command-list.h for common command list
  generate-cmds.sh: export all commands to command-list.h
  generate-cmds.sh: factor out synopsis extract code

diff --cc .gitignore
Simple merge

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git.txt
Simple merge

diff --cc Documentation/gitattributes.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc builtin/help.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc command-list.txt
index 835c5890be93abc1852dd0e1e19dbb627fee6041,e505a1e34c857de3b2596276451e8cc52e970fba..e1c26c1bb7e618f6f372d9a568e7cab75612d2db
--- 1/command-list.txt
--- 2/command-list.txt
+++ b/command-list.txt
@@@ -34,9 -69,8 +69,9 @@@ git-clea
  git-clone                               mainporcelain           init
  git-column                              purehelpers
  git-commit                              mainporcelain           history
 +git-commit-graph                        plumbingmanipulators
  git-commit-tree                         plumbingmanipulators
- git-config                              ancillarymanipulators
+ git-config                              ancillarymanipulators           complete
  git-count-objects                       ancillaryinterrogators
  git-credential                          purehelpers
  git-credential-cache                    purehelpers

diff --cc connect.c
index 31aa9c843311b4e0b01e7378a85709083b071311,ff078d28dcb0c128afd59bab6e93d442f9304b13..968e91b18c09e5ac814328e0f833e2d4aa91cf2c
--- 1/connect.c
--- 2/connect.c
+++ b/connect.c
@@@ -12,11 -12,10 +12,12 @@@
  #include "sha1-array.h"
  #include "transport.h"
  #include "strbuf.h"
 +#include "version.h"
  #include "protocol.h"
+ #include "alias.h"
  
 -static char *server_capabilities;
 +static char *server_capabilities_v1;
 +static struct argv_array server_capabilities_v2 = ARGV_ARRAY_INIT;
  static const char *parse_feature_value(const char *, const char *, int *);
  
  static int check_ref(const char *name, unsigned int flags)

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc git.c
index 5771d62a328d69692291674c7ed0f9050efac3ca,447dac0e71e6f3dc6680dcabc31210c6a967b814..c2f48d53dd4aaba0752aa5f2e6633242d320b248
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -1,8 -1,9 +1,9 @@@
  #include "builtin.h"
  #include "config.h"
 -#include "exec_cmd.h"
 +#include "exec-cmd.h"
  #include "help.h"
  #include "run-command.h"
+ #include "alias.h"
  
  #define RUN_SETUP             (1<<0)
  #define RUN_SETUP_GENTLY      (1<<1)

diff --cc help.c
Simple merge

diff --cc pager.c
Simple merge

diff --cc sequencer.c
index 72b4d8ecae3b07e2259cf05c4a8f4acdb46eae0a,1288a36ebd6eeca2529313333f311dcff3dee017..560fc9b67d480069328d379421c606d800e82135
--- 1/sequencer.c
--- 2/sequencer.c
+++ b/sequencer.c
@@@ -23,10 -23,7 +23,11 @@@
  #include "hashmap.h"
  #include "notes-utils.h"
  #include "sigchain.h"
 +#include "unpack-trees.h"
 +#include "worktree.h"
 +#include "oidmap.h"
 +#include "oidset.h"
+ #include "alias.h"
  
  #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
  

diff --cc shell.c
index 0200d10796c43d6ea1249c314ee158f2b57a481f,3ce77b8e3465c594a5ae07b003e786c948627289..40084a30130ef844899bc1f3321285afdda82607
--- 1/shell.c
--- 2/shell.c
+++ b/shell.c
@@@ -1,8 -1,9 +1,9 @@@
  #include "cache.h"
  #include "quote.h"
 -#include "exec_cmd.h"
 +#include "exec-cmd.h"
  #include "strbuf.h"
  #include "run-command.h"
+ #include "alias.h"
  
  #define COMMAND_DIR "git-shell-commands"
  #define HELP_COMMAND COMMAND_DIR "/help"

diff --cc t/t9902-completion.sh
Simple merge