diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-03 15:13:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-03 15:13:31 -0700 |
| commit | f4ed0af6e2762bc43de474d1fcaa2863b00268eb (patch) | |
| tree | 0553a911a76184db89924518e79b978b65dccc23 /help.h | |
| parent | 9a7b0bca366d8d9b3b26f1bb1a75885780c0f0e4 (diff) | |
| parent | d96e3c150f2b4508f2e7d23ce9183d5b807c2155 (diff) | |
| download | git-f4ed0af6e2762bc43de474d1fcaa2863b00268eb.tar.gz | |
Merge branch 'nd/columns'
A couple of commands learn --column option to produce columnar output.
By Nguyễn Thái Ngọc Duy (9) and Zbigniew Jędrzejewski-Szmek (1)
* nd/columns:
tag: add --column
column: support piping stdout to external git-column process
status: add --column
branch: add --column
help: reuse print_columns() for help -a
column: add dense layout support
t9002: work around shells that are unable to set COLUMNS to 1
column: add columnar layout
Stop starting pager recursively
Add column layout skeleton and git-column
Diffstat (limited to 'help.h')
| -rw-r--r-- | help.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -25,7 +25,6 @@ extern void add_cmdname(struct cmdnames *cmds, const char *name, int len); /* Here we require that excludes is a sorted list. */ extern void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes); extern int is_in_cmdlist(struct cmdnames *cmds, const char *name); -extern void list_commands(struct cmdnames *main_cmds, - struct cmdnames *other_cmds); +extern void list_commands(unsigned int colopts, struct cmdnames *main_cmds, struct cmdnames *other_cmds); #endif /* HELP_H */ |