Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/config.c b/config.c
index 7dbdce1966b3c5e462e377b34ce8a11dd9668c0a..95ec34923d3fcf4d2a8fa16cbab9a5cbfe8e4f6f 100644 (file)
--- a/config.c
+++ b/config.c
@@ -232,6 +232,11 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.warnambiguousrefs")) {
+               warn_ambiguous_refs = git_config_bool(var, value);
+               return 0;
+       }
+
        if (!strcmp(var, "user.name")) {
                strncpy(git_default_name, value, sizeof(git_default_name));
                return 0;