Merge branch 'maint'

diff --git a/builtin/help.c b/builtin/help.c
index 536d4fd46398645589f5ad8555684c0690ad8af7..8f9cd60548c122d8a6f03e0b388f0b6508a3f354 100644 (file)
--- 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])) {