aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-17 21:37:13 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-17 21:37:14 -0700
commita200dc8e62563165df1105eae0e980a44059c6fb (patch)
treeb4133d445668ef81b9f636ee2fc74b141cb6187e /cache.h
parent6e97fccf0c77b15c86e25558d69ce54422ebcf92 (diff)
parent6eba6210d9824445c29b75f9c618abbec5184afd (diff)
downloadgit-a200dc8e62563165df1105eae0e980a44059c6fb.tar.gz
git-a200dc8e62563165df1105eae0e980a44059c6fb.tar.xz
Merge branch 'bc/attr-ignore-case'
* bc/attr-ignore-case: attr.c: respect core.ignorecase when matching attribute patterns attr: read core.attributesfile from git_default_core_config builtin/mv.c: plug miniscule memory leak cleanup: use internal memory allocation wrapper functions everywhere attr.c: avoid inappropriate access to strbuf "buf" member Conflicts: transport-helper.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 85c099655..be07ec708 100644
--- a/cache.h
+++ b/cache.h
@@ -590,6 +590,7 @@ extern int warn_ambiguous_refs;
extern int shared_repository;
extern const char *apply_default_whitespace;
extern const char *apply_default_ignorewhitespace;
+extern const char *git_attributes_file;
extern int zlib_compression_level;
extern int core_compression_level;
extern int core_compression_seen;