Merge branch 'maint'

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

diff --cc Documentation/git-push.txt
Simple merge

diff --cc builtin/apply.c
Simple merge

diff --cc builtin/fetch.c
index 957be9f9269c657fb094b1b3daa4f309c1324ae0,007dabf62f2574fc9214d6fb2a961619ad305a6b..8470850415c14cad8ceeca9f6baef46ab6feabc3
--- 1/builtin/fetch.c
--- 2/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
  };
  

diff --cc builtin/push.c
Simple merge