Merge branch 'jc/maint-limit-note-output' into maint

[git.git] / builtin-rerere.c

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 31fda73ae720e7c3d1abfa149e3259f179454f73..2be9ffb77b38ae687537f3599c9d11e3fbc026a9 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -108,6 +108,9 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
        if (argc < 2)
                return rerere();
 
+       if (!strcmp(argv[1], "-h"))
+               usage(git_rerere_usage);
+
        fd = setup_rerere(&merge_rr);
        if (fd < 0)
                return 0;