{"thread":{"id":"20866","subject":"[PATCH resend] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt","startedAt":"2009-09-07T12:34:35Z","lastAt":"2009-09-08T07:07:23Z","messageCount":5,"participants":["Emmanuel Trillaud","Junio C Hamano","Matthieu Moy"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"122619","messageId":"9f50533b0909070534q2375a793mf5d676b519eae69@mail.gmail.com","threadId":"20866","inReplyTo":null,"subject":"[PATCH resend] 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-07T12:34:35Z","receivedAt":"2009-09-07T12:34:35Z","isPatch":true,"sender":{"key":"etrillaud@gmail.com","avatar":null},"body":"Hello all,\nIn git-pull(1) we can read :\n\nOPTIONS\n      -q, --quiet\n          Operate quietly.\n\n      -v, --verbose\n          Be verbose.\n...\n\n      -q, --quiet\n          Pass --quiet to git-fetch-pack and silence any other\ninternally used git\n          commands.\n\n      -v, --verbose\n          Be verbose.\n\nThe first part is included by merge-option.txt and the second by\nfetch-options.txt.\nI choose to \"suppress\" the fetch-options part because IMHO we don't\nneed that level\nof precision. But if you prefer, I can provide a patch to \"ifndef\" the\nmerge-options.txt part.\n\nBest regard\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 \n---\nDocumentation/fetch-options.txt |    2 ++\n1 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::\nPass --quiet to git-fetch-pack and silence any other internally\n@@ -6,6 +7,7 @@\n-v::\n--verbose::\nBe verbose.\n+endif::git-pull[]\n\n-a::\n--append::\n--\n1.6.4.2.253.g0b1fac\n"},{"id":"122641","messageId":"7vr5uimsao.fsf@alter.siamese.dyndns.org","threadId":"20866","inReplyTo":"9f50533b0909070534q2375a793mf5d676b519eae69@mail.gmail.com","subject":"Re: [PATCH resend] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-09-07T20:08:31Z","receivedAt":"2009-09-07T20:08:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The patch seems to be severely whitespace damaged the same way as in the\nprevious round.\n"},{"id":"122643","messageId":"7v7hwafmu4.fsf@alter.siamese.dyndns.org","threadId":"20866","inReplyTo":"9f50533b0909070534q2375a793mf5d676b519eae69@mail.gmail.com","subject":"Re: [PATCH resend] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-09-07T21:48:19Z","receivedAt":"2009-09-07T21:48:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Emmanuel Trillaud writes:\n\n> I choose to \"suppress\" the fetch-options part because IMHO we don't need\n> that level of precision.\n\nI tried to see both versions myself and came to the same conclusion.\nThanks.\n"},{"id":"122666","messageId":"vpqd462kl4p.fsf@bauges.imag.fr","threadId":"20866","inReplyTo":"9f50533b0909070534q2375a793mf5d676b519eae69@mail.gmail.com","subject":"Re: [PATCH resend] git-pull: fix fetch-options.txt to not document --quiet and --verbose twice in git-pull.txt","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2009-09-08T06:26:14Z","receivedAt":"2009-09-08T06:26:14Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Emmanuel Trillaud writes:\n\n> Hello all,\n> In git-pull(1) we can read :\n\n[...]\n\n> Best regard\n\nI guess this part of your message is not meant to appear in the commit\nmessage. If you leave it here, Junio will have to edit it manually,\nwhereas if you put it where Documentation/SubmitingPatches suggests,\ni.e.\n\n> ---\n\nhere (between --- and diffstat), it's done automatically. Be nice to\nour maintainer, and our mainainer will be nice to you ;-).\n\n> Documentation/fetch-options.txt |    2 ++\n> 1 files changed, 2 insertions(+), 0 deletions(-)\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"122676","messageId":"20090908090723.700fabb6@eleanor","threadId":"20866","inReplyTo":"vpqd462kl4p.fsf@bauges.imag.fr","subject":"Re: [PATCH resend] 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-08T07:07:23Z","receivedAt":"2009-09-08T07:07:23Z","isPatch":true,"sender":{"key":"etrillaud@gmail.com","avatar":null},"body":"Thank you for your patience. \nBecause I want to be kind to our maintainer :-), I've just finish a\ncomplete reading of SubmitingPatches. Next time I promise : no more\nwhistespace mess and a commit message were it is meant to be.\n\nBest regards\n\nEmmanuel Trillaud\n"}]}