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>
This commit is contained in:
parent
c54b74afb7
commit
409b8d82df
@ -31,6 +31,14 @@ in a state that is hard to back out of in the case of a conflict.
|
|||||||
OPTIONS
|
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
|
Options related to merging
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
@ -67,6 +67,7 @@ option can be used to override --squash.
|
|||||||
Synonyms to --stat and --no-stat; these are deprecated and will be
|
Synonyms to --stat and --no-stat; these are deprecated and will be
|
||||||
removed in the future.
|
removed in the future.
|
||||||
|
|
||||||
|
ifndef::git-pull[]
|
||||||
-q::
|
-q::
|
||||||
--quiet::
|
--quiet::
|
||||||
Operate quietly.
|
Operate quietly.
|
||||||
@ -74,6 +75,7 @@ option can be used to override --squash.
|
|||||||
-v::
|
-v::
|
||||||
--verbose::
|
--verbose::
|
||||||
Be verbose.
|
Be verbose.
|
||||||
|
endif::git-pull[]
|
||||||
|
|
||||||
-X <option>::
|
-X <option>::
|
||||||
--strategy-option=<option>::
|
--strategy-option=<option>::
|
||||||
|
Loading…
x
Reference in New Issue
Block a user