Merge branch 'maint-1.5.6' into maint-1.6.0

diff --git a/hash-object.c b/hash-object.c
index 48d522368454d2663d5cc075045d87f120058ced..46c06a9552dac5475afc607c3fe2bf00801eb055 100644 (file)
--- a/hash-object.c
+++ b/hash-object.c
@@ -52,7 +52,7 @@ static void hash_stdin_paths(const char *type, int write_objects)
 }
 
 static const char hash_object_usage[] =
-"git-hash-object [ [-t <type>] [-w] [--stdin] <file>... | --stdin-paths < <list-of-paths> ]";
+"git hash-object [ [-t <type>] [-w] [--stdin] <file>... | --stdin-paths < <list-of-paths> ]";
 
 int main(int argc, char **argv)
 {