X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-rerere.c;h=343d6cde48266d63c0aa6826b973e55b48820745;hb=376f39fbea0dfb31402abda878a7b0018f6a6161;hp=adfb7b5f48597c19c23235b74cf1a0c779985dc6;hpb=c6e73936b9ea26fcad0d77d68194545082343c43;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;