Merge branch 'cb/ignored-paths-are-precious' into pu

[git.git] / config.c

diff --git a/config.c b/config.c
index 304d71efc2df3cbec081677678db07dc63afc2b5..9b09375b65c3414544bfa02c1011d3a34eb568c7 100644 (file)
--- a/config.c
+++ b/config.c
@@ -628,6 +628,11 @@ static int git_default_core_config(const char *var, const char *value)
        if (!strcmp(var, "core.excludesfile"))
                return git_config_pathname(&excludes_file, var, value);
 
+       if (!strcmp(var, "core.ignoredareprecious")) {
+               ignored_are_precious = git_config_bool(var, value);
+               return 0;
+       }
+
        if (!strcmp(var, "core.whitespace")) {
                if (!value)
                        return config_error_nonbool(var);