From: Tay Ray Chuan Date: Wed, 24 Feb 2010 12:50:21 +0000 (+0800) Subject: Documentation/git-pull: put verbosity options before merge/fetch ones X-Git-Tag: v1.7.1-rc0~66^2~8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=409b8d82dfc216ce5e89c81fdc2431dbf897c2d7;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 31f42ea21..d47f9ddd8 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -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 ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 3b83dba1a..37ce9a17f 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -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