From: Emmanuel Trillaud Date: Sat, 08 Aug 2009 10:09:52 GMT Subject: [PATCH] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice Message-ID: <9f50533b0908080309n15c195b7of9d82bc86041ab88@mail.gmail.com> git-pull.txt includes fetch-options.txt and merge-options.txt which both document the --quiet and --verbose parameters. So we supress the --quiet and --verbose paragraphs if fetch-options.txt is included by git-pull.txt --- Documentation/fetch-options.txt | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index d313795..525ce88 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -1,3 +1,6 @@ +//git-pull.txt includes merge-options.txt which documents --quiet and +//--verbose +ifndef::git-pull[] -q:: --quiet:: Pass --quiet to git-fetch-pack and silence any other internally @@ -6,6 +9,7 @@ -v:: --verbose:: Be verbose. +endif::git-pull[] -a:: --append:: -- 1.6.4