Merge branch 'sv/first-parent'

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index bdc7332c7b11c25957ee170b0582f9fe182755eb..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.
 
+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
@@ -50,6 +54,5 @@
 
 \--depth=<depth>::
        Deepen the history of a 'shallow' repository created by
-       `git clone` with `--depth=<depth>` option (see gitlink:git-clone[1])
+       `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
        by the specified number of commits.
-