Merge branch 'cb/maint-quiet-push' into maint

* cb/maint-quiet-push:
receive-pack: do not overstep command line argument array
propagate --quiet to send-pack/receive-pack

Conflicts:
Documentation/git-receive-pack.txt
Documentation/git-send-pack.txt

diff --cc Documentation/git-receive-pack.txt
index 459c08598f31fccf1b5db31f2f1cd9680654b389,23f9a48dd495cd125d4278fc1de5666fe5ca8777..d7b68afbc208c0bd067b4073cff75644888b5ea9
--- 1/Documentation/git-receive-pack.txt
--- 2/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@@ -8,8 -8,7 +8,8 @@@ git-receive-pack - Receive what is push
  
  SYNOPSIS
  --------
- 'git-receive-pack' <directory>
 +[verse]
+ 'git-receive-pack' [--quiet] <directory>
  
  DESCRIPTION
  -----------

diff --cc Documentation/git-send-pack.txt
index bd3eaa69bfb6e788d297b3e7d2c871d25a478f80,67bcd0c568832d7b81ba8f57e0d8e55135cec1d0..bed9e1f097d3aa144a62765129bf3b599d365dcf
--- 1/Documentation/git-send-pack.txt
--- 2/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@@ -8,8 -8,7 +8,8 @@@ git-send-pack - Push objects over git p
  
  SYNOPSIS
  --------
- 'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]
 +[verse]
+ 'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--quiet] [--verbose] [--thin] [<host>:]<directory> [<ref>...]
  
  DESCRIPTION
  -----------

diff --cc remote-curl.c
Simple merge