Merge branch 'master' of git://ozlabs.org/~paulus/gitk

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index e1a46a79581d62596625f9896a77538f6f42faff..5171086181f86b995f89ddc68de94bd2359561a3 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -128,7 +128,10 @@ already exists on the remote side.
        Push all the refs that would be pushed without this option,
        and also push annotated tags in `refs/tags` that are missing
        from the remote but are pointing at commit-ish that are
-       reachable from the refs being pushed.
+       reachable from the refs being pushed.  This can also be specified
+       with configuration variable 'push.followTags'.  For more
+       information, see 'push.followTags' in linkgit:git-config[1].
+
 
 --signed::
        GPG-sign the push request to update refs on the receiving