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>
Miklos Vajna committed
Jan 25, 2008 at 10:17 UTC
10eb64f5fdaad47ff1973a9c55e7aa87a4524190
2 files changed
+9
-4
Documentation/fetch-options.txt
+8
-4
@@ -23,11 +23,15 @@
23
fetches is a descendant of `<lbranch>`. This option
24
overrides that check.
25
26
+ifdef::git-pull[]
27
+\--no-tags::
28
+endif::git-pull[]
29
+ifndef::git-pull[]
30
-n, \--no-tags::
27
- By default, `git-fetch` fetches tags that point at
28
- objects that are downloaded from the remote repository
29
- and stores them locally. This option disables this
30
- automatic tag following.
31
+endif::git-pull[]
32
+ By default, tags that point at objects that are downloaded
33
+ from the remote repository are fetched and stored locally.
34
+ This option disables this automatic tag following.
35
36
-t, \--tags::
37
Most of the tags are fetched automatically as branch
Documentation/git-pull.txt
+1
@@ -25,6 +25,7 @@ OPTIONS
25
-------
26
include::merge-options.txt[]
27
28
+:git-pull: 1
29
include::fetch-options.txt[]
30
31
include::pull-fetch-param.txt[]