Merge branch 'js/windows-dotgit' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 611fe5c0ca223b0f81f275d714a865c57b0d5f68..ce4651be94988394138755920d56e1f3a45cc263 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -279,6 +279,12 @@ See linkgit:git-update-index[1].
 +
 The default is true (when core.filemode is not specified in the config file).
 
+core.hideDotFiles::
+       (Windows-only) If true, mark newly-created directories and files whose
+       name starts with a dot as hidden.  If 'dotGitOnly', only the `.git/`
+       directory is hidden, but no other files starting with a dot.  The
+       default mode is 'dotGitOnly'.
+
 core.ignoreCase::
        If true, this option enables various workarounds to enable
        Git to work better on filesystems that are not case sensitive,