X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-rerere.c;h=343d6cde48266d63c0aa6826b973e55b48820745;hb=0748494e866041034605aaf177f29a61bdc25951;hp=adfb7b5f48597c19c23235b74cf1a0c779985dc6;hpb=39836a2e3cc38735d532a08465774194e5099daf;p=git.git

diff --git a/builtin-rerere.c b/builtin-rerere.c
index adfb7b5f4..343d6cde4 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -106,6 +106,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;