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

From

Miklos Vajna <vmiklos@frugalware.org>

Date

Jan 25, 2008, 09:28 UTC

Message-ID

<20080125092839.GF4475@genesis.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 <vmiklos@frugalware.org>
---

On Thu, Jan 24, 2008 at 05:36:33PM -0800, Junio C Hamano <gitster@pobox.com> wrote:

> > The -n option stands for --no-summary in git pull
>
> Ok, but does that mean --no-tags does not exist there?

 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