diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-22 11:07:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-22 11:07:42 -0700 |
| commit | fd378070c8171ba33a9b1aeca37085e6dfbff35b (patch) | |
| tree | 8bf6d3c8bb8e0e34a7f64430a38c34d8a625e918 | |
| parent | Sync with 1.7.11.1 (diff) | |
| parent | Restore use of 'help.format' configuration property in 'git help' (diff) | |
| download | tgif-fd378070c8171ba33a9b1aeca37085e6dfbff35b.tar.xz | |
Merge branch 'vr/help-per-platform'
* vr/help-per-platform:
Restore use of 'help.format' configuration property in 'git help'
| -rw-r--r-- | builtin/help.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/help.c b/builtin/help.c index 536d4fd463..8f9cd60548 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -449,10 +449,10 @@ int cmd_help(int argc, const char **argv, const char *prefix) setup_git_directory_gently(&nongit); git_config(git_help_config, NULL); - if (parsed_help_format == HELP_FORMAT_NONE) - help_format = parse_help_format(DEFAULT_HELP_FORMAT); - else + if (parsed_help_format != HELP_FORMAT_NONE) help_format = parsed_help_format; + if (help_format == HELP_FORMAT_NONE) + help_format = parse_help_format(DEFAULT_HELP_FORMAT); alias = alias_lookup(argv[0]); if (alias && !is_git_command(argv[0])) { |