aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-23 15:19:45 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-23 15:19:45 -0700
commitffa69e61d3c5730bd4b65a465efc130b0ef3c7df (patch)
treecb407630cecb82890077897c58e9595c73080b03 /Documentation
parent4a13c4d14841343d7caad6ed41a152fee550261d (diff)
parent0d086b8e33820d7cf87386a912e2939c59822f35 (diff)
downloadgit-ffa69e61d3c5730bd4b65a465efc130b0ef3c7df.tar.gz
git-ffa69e61d3c5730bd4b65a465efc130b0ef3c7df.tar.xz
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-receive-pack.txt5
-rw-r--r--Documentation/git-send-pack.txt5
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 459c08598..d7b68afbc 100644
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -9,7 +9,7 @@ git-receive-pack - Receive what is pushed into the repository
SYNOPSIS
--------
[verse]
-'git-receive-pack' <directory>
+'git-receive-pack' [--quiet] <directory>
DESCRIPTION
-----------
@@ -35,6 +35,9 @@ are not fast-forwards.
OPTIONS
-------
+--quiet::
+ Print only error messages.
+
<directory>::
The repository to sync into.
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index bd3eaa69b..bed9e1f09 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -9,7 +9,7 @@ git-send-pack - Push objects over git protocol to another repository
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
-----------
@@ -45,6 +45,9 @@ OPTIONS
the remote repository can lose commits; use it with
care.
+--quiet::
+ Print only error messages.
+
--verbose::
Run verbosely.