{"thread":{"id":"11718","subject":"Query about documentation of git pull -n","startedAt":"2008-01-24T08:51:27Z","lastAt":"2008-01-25T22:13:56Z","messageCount":8,"participants":["Anthony Bolton","Johannes Schindelin","Miklos Vajna","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"66467","messageId":"72481CA3A5A6474EA49CFD2CF28A5D5D02CA348A@hektor.iplbath.com","threadId":"11718","inReplyTo":null,"subject":"Query about documentation of git pull -n","fromName":"Anthony Bolton","fromEmail":"anthony.bolton@ipl.com","sentAt":null,"receivedAt":"2008-01-24T08:51:27Z","isPatch":false,"sender":{"key":"anthony.bolton@ipl.com","avatar":null},"body":"Comment from a new user:\n \nThe git-pull man pages imply that \"git pull -n\" and \"git pull --no-tags\"\nare the same, but -n seems to do something different entirely (same with\ngit fetch). I found this in msysgit but the msysgit boys say that it's\nactually a problem with core git.\n \nIf -n is intended to be different from --no-tags than can you update the\ndocumentation please?\n \nRegards,\nAnthony\n____________________________________________________________\n\nAnthony Bolton\nphone: +44 (0)1225 475290, email: anthony.bolton@ipl.com\n\nIPL Information Processing Limited \nwww.ipl.com\n____________________________________________________________\n\n\n \n\n\nThe information transmitted is intended only for the person\nor entity to which it is addressed and may contain\nconfidential and/or privileged material. If you are not the\naddressee, any disclosure, reproduction, copying,\ndistribution, or other dissemination or use of this\ncommunication is strictly prohibited. If you have received\nthis transmission in error please notify the sender\nimmediately and then delete this email.\n\nAny representations or commitments expressed in this email\nare subject to contract.\n\nThis message has been scanned for viruses and dangerous\ncontent. However, it is essential that the recipient also\nchecks this message using commercially available mail\nscanning and anti-virus software. IPL Information Processing\nLimited accepts no liability for any loss or damage resulting\nfrom any virus or other dangerous content in this message.\n\nIPL Information Processing Limited is registered in England\nand Wales under company registration number 1418818.\nRegistration took place at Cardiff on 10 May 1979. IPL\nInformation Processing Limited's registered office and\nnormal place of business is Eveleigh House, Grove Street,\nBath, BA1 5LR, United Kingdom. IPL is also registered for\nValue Added Tax (VAT) under registration number GB 601 2931 83.\n"},{"id":"66472","messageId":"alpine.LSU.1.00.0801241058330.5731@racer.site","threadId":"11718","inReplyTo":"72481CA3A5A6474EA49CFD2CF28A5D5D02CA348A@hektor.iplbath.com","subject":"Re: Query about documentation of git pull -n","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-01-24T11:01:44Z","receivedAt":"2008-01-24T11:01:44Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 24 Jan 2008, Anthony Bolton wrote:\n\n> Comment from a new user:\n> The git-pull man pages imply that \"git pull -n\" and \"git pull \n> --no-tags\" are the same, but -n seems to do something different entirely \n> (same with git fetch). I found this in msysgit but the msysgit boys say \n> that it's actually a problem with core git.\n\nFWIW I am that msysgit boy. And I did not say anything about git-fetch, \nbut only about git-pull. I even said that \"-n\" means \"--no-summary\" to \ngit-pull.\n\n> If -n is intended to be different from --no-tags than can you update the \n> documentation please?\n\nThat is such a low-hanging fruit. Since you apparently use git yourself, \nthere is not much left to learn in order to fix this bug. IOW this is a \nperfect occasion to get just a little involved in the git development.\n\nJust look at Documentation/diff-options.txt for an example how to use the \n\"ifdef::\" construct, and then use that construct in \nDocumentation/fetch-options.txt.\n\nHth,\nDscho\n"},{"id":"66527","messageId":"20080124232418.GC4475@genesis.frugalware.org","threadId":"11718","inReplyTo":"alpine.LSU.1.00.0801241058330.5731@racer.site","subject":"[PATCH] git pull manpage: don't include -n from fetch-options.txt","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-01-24T23:24:19Z","receivedAt":"2008-01-24T23:24:19Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"The -n option stands for --no-summary in git pull\n\nSigned-off-by: Miklos Vajna \n---\n Documentation/fetch-options.txt | 2 ++\n Documentation/git-pull.txt | 1 +\n 2 files changed, 3 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex 61e48cc..0a1ce68 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -23,11 +23,13 @@\n \tfetches is a descendant of ``. This option\n \toverrides that check.\n \n+ifndef::git-pull[]\n -n, \\--no-tags::\n \tBy default, `git-fetch` fetches tags that point at\n \tobjects that are downloaded from the remote repository\n \tand stores them locally. This option disables this\n \tautomatic tag following.\n+endif::git-pull[]\n \n -t, \\--tags::\n \tMost of the tags are fetched automatically as branch\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 77fdaf1..f9f1e0d 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -25,6 +25,7 @@ OPTIONS\n -------\n include::merge-options.txt[]\n \n+:git-pull: 1\n include::fetch-options.txt[]\n \n include::pull-fetch-param.txt[]\n-- \n1.5.4.rc4-dirty\n"},{"id":"66529","messageId":"alpine.LSU.1.00.0801242358050.5731@racer.site","threadId":"11718","inReplyTo":"20080124232418.GC4475@genesis.frugalware.org","subject":"Re: [PATCH] git pull manpage: don't include -n from fetch-options.txt","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-01-24T23:59:34Z","receivedAt":"2008-01-24T23:59:34Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 25 Jan 2008, Miklos Vajna wrote:\n\n> The -n option stands for --no-summary in git pull\n\nVery nice, Anthony... uhm, oh! Okay, I take that back. Very nice, \nMiklos!\n\nThanks,\nDscho\n"},{"id":"66531","messageId":"7vfxwm8z4u.fsf@gitster.siamese.dyndns.org","threadId":"11718","inReplyTo":"20080124232418.GC4475@genesis.frugalware.org","subject":"Re: [PATCH] git pull manpage: don't include -n from fetch-options.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-01-25T01:36:33Z","receivedAt":"2008-01-25T01:36:33Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Miklos Vajna writes:\n\n> The -n option stands for --no-summary in git pull\n\nOk, but does that mean --no-tags does not exist there?\n"},{"id":"66549","messageId":"20080125092839.GF4475@genesis.frugalware.org","threadId":"11718","inReplyTo":"7vfxwm8z4u.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] git pull manpage: don't include -n from fetch-options.txt","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-01-25T09:28:39Z","receivedAt":"2008-01-25T09:28:39Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"The -n option stands for --no-summary in git pull\n\nSigned-off-by: Miklos Vajna \n---\n\nOn Thu, Jan 24, 2008 at 05:36:33PM -0800, Junio C Hamano wrote:\n> > The -n option stands for --no-summary in git pull\n>\n> Ok, but does that mean --no-tags does not exist there?\n\nOops, my bad. Here is an updated patch to just remove '-n' and keep\n'--no-tags'.\n\n Documentation/fetch-options.txt | 5 +++++\n Documentation/git-pull.txt | 1 +\n 2 files changed, 6 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex 61e48cc..702f953 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -23,7 +23,12 @@\n \tfetches is a descendant of ``. This option\n \toverrides that check.\n \n+ifndef::git-pull[]\n -n, \\--no-tags::\n+endif::git-pull[]\n+ifdef::git-pull[]\n+\\--no-tags::\n+endif::git-pull[]\n \tBy default, `git-fetch` fetches tags that point at\n \tobjects that are downloaded from the remote repository\n \tand stores them locally. This option disables this\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 77fdaf1..f9f1e0d 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -25,6 +25,7 @@ OPTIONS\n -------\n include::merge-options.txt[]\n \n+:git-pull: 1\n include::fetch-options.txt[]\n \n include::pull-fetch-param.txt[]\n-- \n1.5.4.rc4-dirty\n"},{"id":"66554","messageId":"alpine.LSU.1.00.0801251016170.5731@racer.site","threadId":"11718","inReplyTo":"20080125092839.GF4475@genesis.frugalware.org","subject":"[PATCH] git pull manpage: don't include -n from fetch-options.txt","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-01-25T10:17:38Z","receivedAt":"2008-01-25T10:17:38Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Miklos Vajna \n\nThe -n option stands for --no-summary in git pull\n\n[jes: reworded the description to avoid mentioning 'git-fetch';\n also exclude '-n' conditional on git-pull -- ugly because of\n the missing \"else\" statement in asciidoc]\n\nSigned-off-by: Miklos Vajna \nSigned-off-by: Johannes Schindelin \n---\n\n\tOn Fri, 25 Jan 2008, Miklos Vajna wrote:\n\n\t> On Thu, Jan 24, 2008 at 05:36:33PM -0800, Junio C Hamano \n\t> wrote:\n\t>\n\t> > > The -n option stands for --no-summary in git pull\n\t> >\n\t> > Ok, but does that mean --no-tags does not exist there?\n\t> \n\t> Oops, my bad. Here is an updated patch to just remove '-n' and \n\t> keep '--no-tags'.\n\n\tHow about this instead?\n\n Documentation/fetch-options.txt | 12 ++++++++----\n Documentation/git-pull.txt | 1 +\n 2 files changed, 9 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex 61e48cc..b675911 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -23,11 +23,15 @@\n \tfetches is a descendant of ``. This option\n \toverrides that check.\n \n+ifdef::git-pull[]\n+\\--no-tags::\n+endif::git-pull[]\n+ifndef::git-pull[]\n -n, \\--no-tags::\n-\tBy default, `git-fetch` fetches tags that point at\n-\tobjects that are downloaded from the remote repository\n-\tand stores them locally. This option disables this\n-\tautomatic tag following.\n+endif::git-pull[]\n+\tBy default, tags that point at objects that are downloaded\n+\tfrom the remote repository are fetched and stored locally.\n+\tThis option disables this automatic tag following.\n \n -t, \\--tags::\n \tMost of the tags are fetched automatically as branch\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 77fdaf1..f9f1e0d 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -25,6 +25,7 @@ OPTIONS\n -------\n include::merge-options.txt[]\n \n+:git-pull: 1\n include::fetch-options.txt[]\n \n include::pull-fetch-param.txt[]\n-- \n1.5.4.rc4.36.g6e122\n"},{"id":"66602","messageId":"20080125221356.GJ4475@genesis.frugalware.org","threadId":"11718","inReplyTo":"alpine.LSU.1.00.0801251016170.5731@racer.site","subject":"Re: [PATCH] git pull manpage: don't include -n from fetch-options.txt","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-01-25T22:13:56Z","receivedAt":"2008-01-25T22:13:56Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Fri, Jan 25, 2008 at 10:17:38AM +0000, Johannes Schindelin wrote:\n> [jes: reworded the description to avoid mentioning 'git-fetch';\n> also exclude '-n' conditional on git-pull -- ugly because of\n> the missing \"else\" statement in asciidoc]\n\nright, i should have noticed that we should not include git-fetch in the\ngit pull manpage :)\n\nthanks,\n- VMiklos\n"}]}