diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-03 22:13:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-03 22:13:31 (GMT) |
| commit | f4ed0af6e2762bc43de474d1fcaa2863b00268eb (patch) | |
| tree | 0553a911a76184db89924518e79b978b65dccc23 /builtin/help.c | |
| parent | 9a7b0bca366d8d9b3b26f1bb1a75885780c0f0e4 (diff) | |
| parent | d96e3c150f2b4508f2e7d23ce9183d5b807c2155 (diff) | |
| download | git-f4ed0af6e2762bc43de474d1fcaa2863b00268eb.zip git-f4ed0af6e2762bc43de474d1fcaa2863b00268eb.tar.gz git-f4ed0af6e2762bc43de474d1fcaa2863b00268eb.tar.bz2 | |
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 'builtin/help.c')
| -rw-r--r-- | builtin/help.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/builtin/help.c b/builtin/help.c index e63668a..43d3c84 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -9,6 +9,7 @@ #include "common-cmds.h" #include "parse-options.h" #include "run-command.h" +#include "column.h" #include "help.h" static struct man_viewer_list { @@ -30,6 +31,7 @@ enum help_format { }; static int show_all = 0; +static unsigned int colopts; static enum help_format help_format = HELP_FORMAT_NONE; static struct option builtin_help_options[] = { OPT_BOOLEAN('a', "all", &show_all, "print all available commands"), @@ -251,6 +253,8 @@ static int add_man_viewer_info(const char *var, const char *value) static int git_help_config(const char *var, const char *value, void *cb) { + if (!prefixcmp(var, "column.")) + return git_column_config(var, value, "help", &colopts); if (!strcmp(var, "help.format")) { if (!value) return config_error_nonbool(var); @@ -424,8 +428,9 @@ int cmd_help(int argc, const char **argv, const char *prefix) parsed_help_format = help_format; if (show_all) { + git_config(git_help_config, NULL); printf(_("usage: %s%s"), _(git_usage_string), "\n\n"); - list_commands(&main_cmds, &other_cmds); + list_commands(colopts, &main_cmds, &other_cmds); printf("%s\n", _(git_more_info_string)); return 0; } |