Skip to content

Commit 409b8d8

Browse files
rctaygitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c54b74a commit 409b8d8

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

Documentation/git-pull.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ in a state that is hard to back out of in the case of a conflict.
3131
OPTIONS
3232
-------
3333

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+
3442
Options related to merging
3543
~~~~~~~~~~~~~~~~~~~~~~~~~~
3644

Documentation/merge-options.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,15 @@ option can be used to override --squash.
6767
Synonyms to --stat and --no-stat; these are deprecated and will be
6868
removed in the future.
6969

70+
ifndef::git-pull[]
7071
-q::
7172
--quiet::
7273
Operate quietly.
7374

7475
-v::
7576
--verbose::
7677
Be verbose.
78+
endif::git-pull[]
7779

7880
-X <option>::
7981
--strategy-option=<option>::

0 commit comments

Comments
 (0)