Merge branch 'svn-maint-fixes' into svn-fixes

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 31b133b357f34e9bc0a63dec5ce2dbceba43e765..df99df4db1ddb058368fe88f07c890d87600e6d9 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -323,8 +323,8 @@ static int batch_objects(struct batch_options *opt)
 }
 
 static const char * const cat_file_usage[] = {
-       N_("git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"),
-       N_("git cat-file (--batch|--batch-check) < <list_of_objects>"),
+       N_("git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"),
+       N_("git cat-file (--batch | --batch-check) < <list-of-objects>"),
        NULL
 };