Merge branch 'maint'

diff --git a/builtin-rm.c b/builtin-rm.c
index d81f289c3c28fa9afbc99facf6ea81b68306a46d..00dbe399609051647f393e0c543a862a0ba432c8 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -10,7 +10,7 @@
 #include "tree-walk.h"
 
 static const char builtin_rm_usage[] =
-"git-rm [-n] [-f] [--cached] <filepattern>...";
+"git-rm [-f] [-n] [-r] [--cached] [--] <file>...";
 
 static struct {
        int nr, alloc;