X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-rerere.c;h=2be9ffb77b38ae687537f3599c9d11e3fbc026a9;hb=b401a12a2c49d3f3e81e356782d9ca49aaa97faa;hp=31fda73ae720e7c3d1abfa149e3259f179454f73;hpb=e5f591720caea0c6645fa9852903a1c43d7c3672;p=git.git

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 31fda73ae..2be9ffb77 100644
--- 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;