From: Emmanuel Trillaud Date: Mon, 07 Sep 2009 12:34:35 GMT Subject: [PATCH resend] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt Message-ID: <9f50533b0909070534q2375a793mf5d676b519eae69@mail.gmail.com> Hello all, In git-pull(1) we can read : OPTIONS       -q, --quiet           Operate quietly.       -v, --verbose           Be verbose. ...       -q, --quiet           Pass --quiet to git-fetch-pack and silence any other internally used git           commands.       -v, --verbose           Be verbose. The first part is included by merge-option.txt and the second by fetch-options.txt. I choose to "suppress" the fetch-options part because IMHO we don't need that level of precision. But if you prefer, I can provide a patch to "ifndef" the merge-options.txt part. Best regard 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 Signed-off-by: Emmanuel Trillaud --- Documentation/fetch-options.txt |    2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index ea3b1bc..5eb2b0e 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -1,3 +1,4 @@ +ifndef::git-pull[] -q:: --quiet:: Pass --quiet to git-fetch-pack and silence any other internally @@ -6,6 +7,7 @@ -v:: --verbose:: Be verbose. +endif::git-pull[] -a:: --append:: -- 1.6.4.2.253.g0b1fac