Merge branch 'dj/fetch-tagopt'

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 19b6dc6ddaf625bcd337764ec626a07408511aac..61831f60ce61f8a601fed3ba0b40559929d0ee61 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1646,7 +1646,9 @@ remote.<name>.tagopt::
        Setting this value to \--no-tags disables automatic tag following when
        fetching from remote <name>. Setting it to \--tags will fetch every
        tag from remote <name>, even if they are not reachable from remote
-       branch heads.
+       branch heads. Passing these flags directly to linkgit:git-fetch[1] can
+       override this setting. See options \--tags and \--no-tags of
+       linkgit:git-fetch[1].
 
 remote.<name>.vcs::
        Setting this to a value <vcs> will cause git to interact with