{"thread":{"id":"20481","subject":"[PATCH] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice","startedAt":"2009-08-08T10:09:52Z","lastAt":"2009-08-08T10:09:52Z","messageCount":1,"participants":["Emmanuel Trillaud"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"119982","messageId":"9f50533b0908080309n15c195b7of9d82bc86041ab88@mail.gmail.com","threadId":"20481","inReplyTo":null,"subject":"[PATCH] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice","fromName":"Emmanuel Trillaud","fromEmail":"etrillaud@gmail.com","sentAt":"2009-08-08T10:09:52Z","receivedAt":"2009-08-08T10:09:52Z","isPatch":true,"sender":{"key":"etrillaud@gmail.com","avatar":null},"body":"git-pull.txt includes fetch-options.txt and merge-options.txt which both\ndocument the --quiet and --verbose parameters. So we supress the\n--quiet and --verbose paragraphs if fetch-options.txt is included by\ngit-pull.txt\n---\n Documentation/fetch-options.txt |    4 ++++\n 1 files changed, 4 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex d313795..525ce88 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -1,3 +1,6 @@\n+//git-pull.txt includes merge-options.txt which documents --quiet and\n+//--verbose\n+ifndef::git-pull[]\n -q::\n --quiet::\n \tPass --quiet to git-fetch-pack and silence any other internally\n@@ -6,6 +9,7 @@\n -v::\n --verbose::\n \tBe verbose.\n+endif::git-pull[]\n\n -a::\n --append::\n-- \n1.6.4\n"}]}