Merge branch 'js/bundle'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6309d89b4bb9e6cefd868fb87dd78dfd3dd32d24..d2b4a05ca5849c59514c6f0e67c8b31ad444be9e 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -483,6 +483,10 @@ remote.<name>.uploadpack::
        The default program to execute on the remote side when fetching.  See
        option \--exec of gitlink:git-fetch-pack[1].
 
+remote.<name>.tagopt::
+       Setting this value to --no-tags disables automatic tag following when fetching
+       from remote <name>
+
 remotes.<group>::
        The list of remotes which are fetched by "git remote update
        <group>".  See gitlink:git-remote[1].