Sync with 2.3.1

diff --git a/builtin/check-mailmap.c b/builtin/check-mailmap.c
index 8f4d809bd8c00558b34022cc0c46423a6b19243c..eaaea546d30871ad7442456f7eec4ae849f68374 100644 (file)
--- a/builtin/check-mailmap.c
+++ b/builtin/check-mailmap.c
@@ -5,7 +5,7 @@
 
 static int use_stdin;
 static const char * const check_mailmap_usage[] = {
-N_("git check-mailmap [options] <contact>..."),
+N_("git check-mailmap [<options>] <contact>..."),
 NULL
 };