Documentation/git-pull: put verbosity options before merge/fetch ones
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan committed
Feb 24, 2010 at 20:50 UTC
409b8d82dfc216ce5e89c81fdc2431dbf897c2d7
2 files changed
+10
Documentation/git-pull.txt
+8
@@ -31,6 +31,14 @@ in a state that is hard to back out of in the case of a conflict.
31
OPTIONS
32
-------
33
34
+-q::
35
+--quiet::
36
+ Pass --quiet to git-fetch and git-merge.
37
+
38
+-v::
39
+--verbose::
40
+ Pass --verbose to git-fetch and git-merge.
41
+
42
Options related to merging
43
~~~~~~~~~~~~~~~~~~~~~~~~~~
44
Documentation/merge-options.txt
+2
@@ -67,6 +67,7 @@ option can be used to override --squash.
67
Synonyms to --stat and --no-stat; these are deprecated and will be
68
removed in the future.
69
70
+ifndef::git-pull[]
71
-q::
72
--quiet::
73
Operate quietly.
@@ -74,6 +75,7 @@ option can be used to override --squash.
75
-v::
76
--verbose::
77
Be verbose.
78
+endif::git-pull[]
79
80
-X <option>::
81
--strategy-option=<option>::