From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 10 Apr 2010 05:43:18 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc1~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b0c19663e7976cd32188b42e762c980d1bb93d4;p=git.git

Merge branch 'maint'

* maint:
  Let check_preimage() use memset() to initialize "struct checkout"
  fetch/push: fix usage strings
---

3b0c19663e7976cd32188b42e762c980d1bb93d4
diff --cc builtin/fetch.c
index 957be9f92,007dabf62..847085041
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -11,13 -11,12 +11,13 @@@
  #include "run-command.h"
  #include "parse-options.h"
  #include "sigchain.h"
 +#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
  };