diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-29 14:51:14 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-29 14:51:14 +0900 |
| commit | 17b3e5150506281fd2d675c150cf1e71f914ad54 (patch) | |
| tree | 7b3fbbb04c5b03178d3d44f51fdf45dea35eba29 /builtin/merge.c | |
| parent | The sixth batch for 2.18 (diff) | |
| parent | completion: allow to customize the completable command list (diff) | |
| download | tgif-17b3e5150506281fd2d675c150cf1e71f914ad54.tar.xz | |
Merge branch 'nd/command-list' into nd/complete-config-vars
* 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
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 9db5a2cf16..e3681cd850 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -34,6 +34,7 @@ #include "string-list.h" #include "packfile.h" #include "tag.h" +#include "alias.h" #define DEFAULT_TWOHEAD (1<<0) #define DEFAULT_OCTOPUS (1<<1) |