git_attr(): fix function signature

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 31fda73ae720e7c3d1abfa149e3259f179454f73..0253abf9b698ed10a8df5c21ef07c93b8e6460dc 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -108,6 +108,11 @@ 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);
+       else if (!strcmp(argv[1], "forget"))
+               return rerere_forget(argv + 2);
+
        fd = setup_rerere(&merge_rr);
        if (fd < 0)
                return 0;