Skip to content

Commit

Permalink
Documentation/git-pull: put verbosity options before merge/fetch ones
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tay Ray Chuan authored and Junio C Hamano committed Feb 24, 2010
1 parent c54b74a commit 409b8d8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Documentation/git-pull.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
2 changes: 2 additions & 0 deletions Documentation/merge-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,15 @@ 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.

-v::
--verbose::
Be verbose.
endif::git-pull[]

-X <option>::
--strategy-option=<option>::
Expand Down

0 comments on commit 409b8d8

Please sign in to comment.