Merge branch 'jk/unbreak-am-h'

diff --git a/builtin/am.c b/builtin/am.c
index 0f63dcab1610f111f19b513eea47089132c1c702..5ee146bfb31df8e3d8edf356f4817e3f53f8ad3b 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2311,6 +2311,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage_with_options(usage, options);
+
        git_config(git_am_config, NULL);
 
        am_state_init(&state);