development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documentation/git-pull: put verbosity options before merge/fetch ones

Browse source 
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:
Tay Ray Chuan 2010-02-24 20:50:21 +08:00 committed by Junio C Hamano
parent c54b74afb7
commit 409b8d82df
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Documentation/git-pull.txt
View file

@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~

2
Documentation/merge-options.txt
View file

@ -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>::