# Query about documentation of git pull -n 8 messages from 2008-01-24 to 2008-01-25. Participants: Anthony Bolton, Johannes Schindelin, Miklos Vajna, Junio C Hamano. Thread: https://gitlist.dev/t/11718 ## Anthony Bolton, 2008-01-24 08:51 Subject: Query about documentation of git pull -n Message-ID: <72481CA3A5A6474EA49CFD2CF28A5D5D02CA348A@hektor.iplbath.com> URL: https://gitlist.dev/e/72481CA3A5A6474EA49CFD2CF28A5D5D02CA348A%40hektor.iplbath.com ``` Comment from a new user: The git-pull man pages imply that "git pull -n" and "git pull --no-tags" are the same, but -n seems to do something different entirely (same with git fetch). I found this in msysgit but the msysgit boys say that it's actually a problem with core git. If -n is intended to be different from --no-tags than can you update the documentation please? Regards, Anthony ____________________________________________________________ Anthony Bolton phone: +44 (0)1225 475290, email: anthony.bolton@ipl.com IPL Information Processing Limited www.ipl.com ____________________________________________________________ The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. If you are not the addressee, any disclosure, reproduction, copying, distribution, or other dissemination or use of this communication is strictly prohibited. If you have received this transmission in error please notify the sender immediately and then delete this email. Any representations or commitments expressed in this email are subject to contract. This message has been scanned for viruses and dangerous content. However, it is essential that the recipient also checks this message using commercially available mail scanning and anti-virus software. IPL Information Processing Limited accepts no liability for any loss or damage resulting from any virus or other dangerous content in this message. IPL Information Processing Limited is registered in England and Wales under company registration number 1418818. Registration took place at Cardiff on 10 May 1979. IPL Information Processing Limited's registered office and normal place of business is Eveleigh House, Grove Street, Bath, BA1 5LR, United Kingdom. IPL is also registered for Value Added Tax (VAT) under registration number GB 601 2931 83. ``` ## Johannes Schindelin, 2008-01-24 11:01 Subject: Re: Query about documentation of git pull -n Message-ID: URL: https://gitlist.dev/e/alpine.LSU.1.00.0801241058330.5731%40racer.site In-Reply-To: <72481CA3A5A6474EA49CFD2CF28A5D5D02CA348A@hektor.iplbath.com> ``` Hi, On Thu, 24 Jan 2008, Anthony Bolton wrote: > Comment from a new user: > The git-pull man pages imply that "git pull -n" and "git pull > --no-tags" are the same, but -n seems to do something different entirely > (same with git fetch). I found this in msysgit but the msysgit boys say > that it's actually a problem with core git. FWIW I am that msysgit boy. And I did not say anything about git-fetch, but only about git-pull. I even said that "-n" means "--no-summary" to git-pull. > If -n is intended to be different from --no-tags than can you update the > documentation please? That is such a low-hanging fruit. Since you apparently use git yourself, there is not much left to learn in order to fix this bug. IOW this is a perfect occasion to get just a little involved in the git development. Just look at Documentation/diff-options.txt for an example how to use the "ifdef::" construct, and then use that construct in Documentation/fetch-options.txt. Hth, Dscho ``` ## Miklos Vajna, 2008-01-24 23:24 Subject: [PATCH] git pull manpage: don't include -n from fetch-options.txt Message-ID: <20080124232418.GC4475@genesis.frugalware.org> URL: https://gitlist.dev/e/20080124232418.GC4475%40genesis.frugalware.org In-Reply-To: ``` The -n option stands for --no-summary in git pull Signed-off-by: Miklos Vajna --- Documentation/fetch-options.txt | 2 ++ Documentation/git-pull.txt | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 61e48cc..0a1ce68 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -23,11 +23,13 @@ fetches is a descendant of ``. This option overrides that check. +ifndef::git-pull[] -n, \--no-tags:: By default, `git-fetch` fetches tags that point at objects that are downloaded from the remote repository and stores them locally. This option disables this automatic tag following. +endif::git-pull[] -t, \--tags:: Most of the tags are fetched automatically as branch diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 77fdaf1..f9f1e0d 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -25,6 +25,7 @@ OPTIONS ------- include::merge-options.txt[] +:git-pull: 1 include::fetch-options.txt[] include::pull-fetch-param.txt[] -- 1.5.4.rc4-dirty ``` ## Johannes Schindelin, 2008-01-24 23:59 Subject: Re: [PATCH] git pull manpage: don't include -n from fetch-options.txt Message-ID: URL: https://gitlist.dev/e/alpine.LSU.1.00.0801242358050.5731%40racer.site In-Reply-To: <20080124232418.GC4475@genesis.frugalware.org> ``` Hi, On Fri, 25 Jan 2008, Miklos Vajna wrote: > The -n option stands for --no-summary in git pull Very nice, Anthony... uhm, oh! Okay, I take that back. Very nice, Miklos! Thanks, Dscho ``` ## Junio C Hamano, 2008-01-25 01:36 Subject: Re: [PATCH] git pull manpage: don't include -n from fetch-options.txt Message-ID: <7vfxwm8z4u.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vfxwm8z4u.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20080124232418.GC4475@genesis.frugalware.org> ``` Miklos Vajna writes: > The -n option stands for --no-summary in git pull Ok, but does that mean --no-tags does not exist there? ``` ## Miklos Vajna, 2008-01-25 09:28 Subject: [PATCH] git pull manpage: don't include -n from fetch-options.txt Message-ID: <20080125092839.GF4475@genesis.frugalware.org> URL: https://gitlist.dev/e/20080125092839.GF4475%40genesis.frugalware.org In-Reply-To: <7vfxwm8z4u.fsf@gitster.siamese.dyndns.org> ``` The -n option stands for --no-summary in git pull Signed-off-by: Miklos Vajna --- On Thu, Jan 24, 2008 at 05:36:33PM -0800, Junio C Hamano wrote: > > The -n option stands for --no-summary in git pull > > Ok, but does that mean --no-tags does not exist there? Oops, my bad. Here is an updated patch to just remove '-n' and keep '--no-tags'. Documentation/fetch-options.txt | 5 +++++ Documentation/git-pull.txt | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 61e48cc..702f953 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -23,7 +23,12 @@ fetches is a descendant of ``. This option overrides that check. +ifndef::git-pull[] -n, \--no-tags:: +endif::git-pull[] +ifdef::git-pull[] +\--no-tags:: +endif::git-pull[] By default, `git-fetch` fetches tags that point at objects that are downloaded from the remote repository and stores them locally. This option disables this diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 77fdaf1..f9f1e0d 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -25,6 +25,7 @@ OPTIONS ------- include::merge-options.txt[] +:git-pull: 1 include::fetch-options.txt[] include::pull-fetch-param.txt[] -- 1.5.4.rc4-dirty ``` ## Johannes Schindelin, 2008-01-25 10:17 Subject: [PATCH] git pull manpage: don't include -n from fetch-options.txt Message-ID: URL: https://gitlist.dev/e/alpine.LSU.1.00.0801251016170.5731%40racer.site In-Reply-To: <20080125092839.GF4475@genesis.frugalware.org> ``` From: Miklos Vajna The -n option stands for --no-summary in git pull [jes: reworded the description to avoid mentioning 'git-fetch'; also exclude '-n' conditional on git-pull -- ugly because of the missing "else" statement in asciidoc] Signed-off-by: Miklos Vajna Signed-off-by: Johannes Schindelin --- On Fri, 25 Jan 2008, Miklos Vajna wrote: > On Thu, Jan 24, 2008 at 05:36:33PM -0800, Junio C Hamano > wrote: > > > > The -n option stands for --no-summary in git pull > > > > Ok, but does that mean --no-tags does not exist there? > > Oops, my bad. Here is an updated patch to just remove '-n' and > keep '--no-tags'. How about this instead? Documentation/fetch-options.txt | 12 ++++++++---- Documentation/git-pull.txt | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 61e48cc..b675911 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -23,11 +23,15 @@ fetches is a descendant of ``. This option overrides that check. +ifdef::git-pull[] +\--no-tags:: +endif::git-pull[] +ifndef::git-pull[] -n, \--no-tags:: - By default, `git-fetch` fetches tags that point at - objects that are downloaded from the remote repository - and stores them locally. This option disables this - automatic tag following. +endif::git-pull[] + By default, tags that point at objects that are downloaded + from the remote repository are fetched and stored locally. + This option disables this automatic tag following. -t, \--tags:: Most of the tags are fetched automatically as branch diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 77fdaf1..f9f1e0d 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -25,6 +25,7 @@ OPTIONS ------- include::merge-options.txt[] +:git-pull: 1 include::fetch-options.txt[] include::pull-fetch-param.txt[] -- 1.5.4.rc4.36.g6e122 ``` ## Miklos Vajna, 2008-01-25 22:13 Subject: Re: [PATCH] git pull manpage: don't include -n from fetch-options.txt Message-ID: <20080125221356.GJ4475@genesis.frugalware.org> URL: https://gitlist.dev/e/20080125221356.GJ4475%40genesis.frugalware.org In-Reply-To: ``` On Fri, Jan 25, 2008 at 10:17:38AM +0000, Johannes Schindelin wrote: > [jes: reworded the description to avoid mentioning 'git-fetch'; > also exclude '-n' conditional on git-pull -- ugly because of > the missing "else" statement in asciidoc] right, i should have noticed that we should not include git-fetch in the git pull manpage :) thanks, - VMiklos ```