summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-17 17:26:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-17 17:26:05 -0700
commit6dd5622f68157f471c4f784e8c41f39e8c5163fc (patch)
tree0ec2b265ea60b53afbc0ec52fe61fa2476b4dbfa /Documentation
parentMerge branch 'jc/maint-combined-diff-work-tree' (diff)
parentreceive-pack: do not overstep command line argument array (diff)
downloadtgif-6dd5622f68157f471c4f784e8c41f39e8c5163fc.tar.xz
Merge branch 'cb/maint-quiet-push'
* 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 459c08598f..d7b68afbc2 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 bd3eaa69bf..bed9e1f097 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.