Re: [PATCH] git pull manpage: don't include -n from fetch-options.txt

Miklos Vajna [off-list ref] writes:

The -n option stands for --no-summary in git pull

Ok, but does that mean --no-tags does not exist there?

The -n option stands for --no-summary in git pull

Signed-off-by: Miklos Vajna <redacted>
---

On Thu, Jan 24, 2008 at 05:36:33PM -0800, Junio C Hamano [off-list ref] wrote:

quoted

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 `<lbranch>`.  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

From: Miklos Vajna <redacted>

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 <redacted>
Signed-off-by: Johannes Schindelin <redacted>
---

	On Fri, 25 Jan 2008, Miklos Vajna wrote:

	> On Thu, Jan 24, 2008 at 05:36:33PM -0800, Junio C Hamano 
	> [off-list ref] 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 `<lbranch>`.  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

On Fri, Jan 25, 2008 at 10:17:38AM +0000, Johannes Schindelin [off-list ref] 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