summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-22 18:07:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-06-22 18:07:42 (GMT)
commitfd378070c8171ba33a9b1aeca37085e6dfbff35b (patch)
tree8bf6d3c8bb8e0e34a7f64430a38c34d8a625e918
parent0e18bef7e62d6fffd09c394381056ec7a4a79840 (diff)
parentd0408c0c8cd636233f01c0bda9ad71161609297c (diff)
downloadgit-fd378070c8171ba33a9b1aeca37085e6dfbff35b.zip
git-fd378070c8171ba33a9b1aeca37085e6dfbff35b.tar.gz
git-fd378070c8171ba33a9b1aeca37085e6dfbff35b.tar.bz2
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/help.c b/builtin/help.c
index 536d4fd..8f9cd60 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])) {