Merge branch 'maint'

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.
 
+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