{"thread":{"id":"20822","subject":"[PATCH] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt","startedAt":"2009-09-02T14:38:26Z","lastAt":"2009-09-02T14:38:26Z","messageCount":1,"participants":["Emmanuel Trillaud"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"122309","messageId":"9f50533b0909020738l153c928auc4ecbadfaceeea5f@mail.gmail.com","threadId":"20822","inReplyTo":null,"subject":"[PATCH] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt","fromName":"Emmanuel Trillaud","fromEmail":"etrillaud@gmail.com","sentAt":"2009-09-02T14:38:26Z","receivedAt":"2009-09-02T14:38:26Z","isPatch":true,"sender":{"key":"etrillaud@gmail.com","avatar":null},"body":"Hello all!\nthe current man page of git-pull documents twice the --quiet and\n--verbose options. fetch-options.txt and merge-options.txt which both\ndocuments these options.\nI choose to \"ifndef\" the paragraphs in fetch-options.txt because IMHO\nthey give too much details on the --quiet option (see the patch\nbelow). Of course we could modify merge-options.txt instead (the\n--quiet paragraph just says : \"operate quietly\"), I can provide a\npatch if you want.\n\nBest regards\n\n-----------------\n\ngit-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\nSigned-off-by: Emmanuel Trillaud <etrillaud@gmail.com>\n---\n Documentation/fetch-options.txt |    2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex ea3b1bc..5eb2b0e 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -1,3 +1,4 @@\n+ifndef::git-pull[]\n -q::\n --quiet::\n \tPass --quiet to git-fetch-pack and silence any other internally\n@@ -6,6 +7,7 @@\n -v::\n --verbose::\n \tBe verbose.\n+endif::git-pull[]\n\n -a::\n --append::\n-- \n1.6.4.2.253.g0b1fac\n"}]}