[PATCH] git pull manpage: don't include -n from fetch-options.txt
The -n option stands for --no-summary in git pull
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
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 `<lbranch>`. 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
Miklos Vajna <vmiklos@frugalware.org>