From: Emmanuel Trillaud <etrillaud@gmail.com>
Date: Mon, 7 Sep 2009 12:34:35 +0000 (+0200)
Subject: git-pull: do not mention --quiet and --verbose twice
X-Git-Tag: v1.6.5-rc0~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=90e431152e05d3e8eb80a0db2e81b7cf50ecc745;p=git.git

git-pull: do not mention --quiet and --verbose twice

git-pull.txt includes fetch-options.txt and merge-options.txt, both of
which document the --quiet and --verbose.

Supress the ones from fetch-options.txt.

Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index ea3b1bc19..5eb2b0ee0 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -1,3 +1,4 @@
+ifndef::git-pull[]
 -q::
 --quiet::
 	Pass --quiet to git-fetch-pack and silence any other internally
@@ -6,6 +7,7 @@
 -v::
 --verbose::
 	Be verbose.
+endif::git-pull[]
 
 -a::
 --append::