[PATCH v2 02/10] Documentation/git-pull: put verbosity options before merge/fetch ones

[Tay Ray Chuan <rctay89@gmail.com>]

After 3f7a9b5 (Documentation/git-pull.txt: Add subtitles above included
option files, Thu Oct 22 2009), the -q/-v options were mentioned only
for the merge options section, giving the impression that git-fetch did
not take those arguments.

Follow 90e4311 (git-pull: do not mention --quiet and --verbose twice,
Mon Sep 7 2009) and hide -q/-v for merge options, while mentioning -q/-v
before the merge- and fetch-specific options.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---

Changes from v1:
  - put verbosity options (-v and -q) in a common area for the
    documentation for git-pull, as per Junio's suggestion
    (<7vhbpe5jvo.fsf@alter.siamese.dyndns.org>).

 Documentation/git-pull.txt      |    8 ++++++++
 Documentation/merge-options.txt |    2 ++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 31f42ea..d47f9dd 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -31,6 +31,14 @@ in a state that is hard to back out of in the case of a conflict.
 OPTIONS
 -------

+-q::
+--quiet::
+	Pass --quiet to git-fetch and git-merge.
+
+-v::
+--verbose::
+	Pass --verbose to git-fetch and git-merge.
+
 Options related to merging
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 3b83dba..37ce9a1 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -67,6 +67,7 @@ option can be used to override --squash.
 	Synonyms to --stat and --no-stat; these are deprecated and will be
 	removed in the future.

+ifndef::git-pull[]
 -q::
 --quiet::
 	Operate quietly.
@@ -74,6 +75,7 @@ option can be used to override --squash.
 -v::
 --verbose::
 	Be verbose.
+endif::git-pull[]

 -X <option>::
 --strategy-option=<option>::
--
1.7.0.20.gcb44ed