Merge branch 'js/windows-dotgit'

diff --git a/config.c b/config.c
index 21ff89cfb056f311e8e3ae258b529b2f207b6a83..096fe03166650f2e1e974bb1d2abac8a93ef33d6 100644 (file)
--- a/config.c
+++ b/config.c
@@ -915,6 +915,14 @@ static int git_default_core_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.hidedotfiles")) {
+               if (value && !strcasecmp(value, "dotgitonly"))
+                       hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
+               else
+                       hide_dotfiles = git_config_bool(var, value);
+               return 0;
+       }
+
        /* Add other config variables here and to Documentation/config.txt. */
        return 0;
 }