[PATCH] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt

[PATCH] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt

[Emmanuel Trillaud]

Hello all!
the current man page of git-pull documents twice the --quiet and
--verbose options. fetch-options.txt and merge-options.txt which both
documents these options.
I choose to "ifndef" the paragraphs in fetch-options.txt because IMHO
they give too much details on the --quiet option (see the patch
below). Of course we could modify merge-options.txt instead (the
--quiet paragraph just says : "operate quietly"), I can provide a
patch if you want.

Best regards

-----------------

git-pull.txt includes fetch-options.txt and merge-options.txt which both
document the --quiet and --verbose parameters. So we supress the
--quiet and --verbose paragraphs if fetch-options.txt is included by
git-pull.txt.

Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com>
---
 Documentation/fetch-options.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index ea3b1bc..5eb2b0e 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::
-- 
1.6.4.2.253.g0b1fac