author | Junio C Hamano <gitster@pobox.com> | |
Tue, 23 Aug 2011 22:19:45 +0000 (15:19 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 23 Aug 2011 22:19:45 +0000 (15:19 -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
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 | patch | | diff1 | | diff2 | | blob | history |
Documentation/git-send-pack.txt | patch | | diff1 | | diff2 | | blob | history |
remote-curl.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-receive-pack.txt
index 459c08598f31fccf1b5db31f2f1cd9680654b389,23f9a48dd495cd125d4278fc1de5666fe5ca8777..d7b68afbc208c0bd067b4073cff75644888b5ea9
SYNOPSIS
--------
- 'git-receive-pack' <directory>
+[verse]
+ 'git-receive-pack' [--quiet] <directory>
DESCRIPTION
-----------
diff --cc Documentation/git-send-pack.txt
index bd3eaa69bfb6e788d297b3e7d2c871d25a478f80,67bcd0c568832d7b81ba8f57e0d8e55135cec1d0..bed9e1f097d3aa144a62765129bf3b599d365dcf
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