Merge branch 'maint'

diff --git a/builtin/gc.c b/builtin/gc.c
index 397a1e6eb3ae8ec0e367a8faa2ca823586d26e6a..1a80702b3d1c86b55af24be3b3396f17e9d4a21c 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -189,6 +189,9 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage_with_options(builtin_gc_usage, builtin_gc_options);
+
        git_config(gc_config, NULL);
 
        if (pack_refs < 0)