From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Aug 2011 22:19:45 +0000 (-0700)
Subject: Merge branch 'cb/maint-quiet-push' into maint
X-Git-Tag: v1.7.6.1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ffa69e61d3c5730bd4b65a465efc130b0ef3c7df;p=git.git

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
---

ffa69e61d3c5730bd4b65a465efc130b0ef3c7df
diff --cc Documentation/git-receive-pack.txt
index 459c08598,23f9a48dd..d7b68afbc
--- a/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
  --------
 +[verse]
- 'git-receive-pack' <directory>
+ 'git-receive-pack' [--quiet] <directory>
  
  DESCRIPTION
  -----------
diff --cc Documentation/git-send-pack.txt
index bd3eaa69b,67bcd0c56..bed9e1f09
--- a/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
  --------
 +[verse]
- 'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]
+ 'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--quiet] [--verbose] [--thin] [<host>:]<directory> [<ref>...]
  
  DESCRIPTION
  -----------