Merge branch 'maint'

* maint: Let check_preimage() use memset() to initialize "struct checkout" fetch/push: fix usage strings
2010-04-09 22:43:18 -07:00
parent da288e25d9 54fd955c21
commit 3b0c19663e
5 changed files with 11 additions and 14 deletions
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@ -14,10 +14,10 @@
 #include "transport.h"

 static const char * const builtin_fetch_usage[] = {
-	"git fetch [options] [<repository> <refspec>...]",
-	"git fetch [options] <group>",
-	"git fetch --multiple [options] [<repository> | <group>]...",
-	"git fetch --all [options]",
+	"git fetch [<options>] [<repository> [<refspec>...]]",
+	"git fetch [<options>] <group>",
+	"git fetch --multiple [<options>] [<repository> | <group>]...",
+	"git fetch --all [<options>]",
 	NULL
 };