Merge branch 'jk/test-annoyances'

diff --git a/builtin/rm.c b/builtin/rm.c
index d8a9c86dd135e62583f4aeeb3885012da385960a..3304bff42a2fb91f66b9bbca1117746eaa22352a 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -14,7 +14,7 @@
 #include "pathspec.h"
 
 static const char * const builtin_rm_usage[] = {
-       N_("git rm [options] [--] <file>..."),
+       N_("git rm [<options>] [--] <file>..."),
        NULL
 };