Merge branch 'jn/gitweb-per-request-config'

diff --git a/builtin/branch.c b/builtin/branch.c
index 807355a1982f0f91e9acea66c360903fc3714495..0cad20bb5a8bd0054761861aada7f1077260dbd5 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -668,6 +668,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                OPT_END(),
        };
 
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage_with_options(builtin_branch_usage, options);
+
        git_config(git_branch_config, NULL);
 
        if (branch_use_color == -1)