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

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 <vmiklos@frugalware.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 61e48ccf0284d60c93e049bacf9bbe1050bfa987..b6759114804e89d6f92e48b8dfe4d93b1f8202d0 100644 (file)
--- 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.
 
        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::
 -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
 
 -t, \--tags::
        Most of the tags are fetched automatically as branch

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 77fdaf146eaa20327b0830ac69a6cc6b3e8f9797..f9f1e0d30b5ba9842d5071d3d3fba3599cd96ebf 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -25,6 +25,7 @@ OPTIONS
 -------
 include::merge-options.txt[]
 
 -------
 include::merge-options.txt[]
 

+:git-pull: 1

 include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
 include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]