Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 98eb8c5404914e4046fdb886866b611351deeacf..7afadd2eadd59d8d3f4b77ad902bc24c94af9ec6 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -9,7 +9,7 @@
 #include "pathspec.h"
 
 static const char * const rerere_usage[] = {
-       N_("git rerere [clear | forget path... | status | remaining | diff | gc]"),
+       N_("git rerere [clear | forget <path>... | status | remaining | diff | gc]"),
        NULL,
 };