Merge branch 'js/gitdir-at-unc-root'

diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt
index e66d79fd76059fd953aa9baec928603389cd8455..852d2ba37a1204e0e210e9abf671d7f0c9c850d8 100644 (file)
--- a/Documentation/config/core.txt
+++ b/Documentation/config/core.txt
@@ -86,7 +86,9 @@ core.untrackedCache::
        it will automatically be removed, if set to `false`. Before
        setting it to `true`, you should check that mtime is working
        properly on your system.
-       See linkgit:git-update-index[1]. `keep` by default.
+       See linkgit:git-update-index[1]. `keep` by default, unless
+       `feature.manyFiles` is enabled which sets this setting to
+       `true` by default.
 
 core.checkStat::
        When missing or is set to `default`, many fields in the stat