Merge branch 'cb/maint-quiet-push'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Aug 2011 00:26:05 +0000 (17:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Aug 2011 00:26:05 +0000 (17:26 -0700)
* 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

1  2 
Documentation/git-receive-pack.txt
Documentation/git-send-pack.txt
remote-curl.c

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