summaryrefslogtreecommitdiff
path: root/environment.c
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 /environment.c
parent6e97fccf0c77b15c86e25558d69ce54422ebcf92 (diff)
parent6eba6210d9824445c29b75f9c618abbec5184afd (diff)
downloadgit-a200dc8e62563165df1105eae0e980a44059c6fb.tar.gz
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 'environment.c')
-rw-r--r--environment.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 8174b703c4..0bee6a7a88 100644
--- a/environment.c
+++ b/environment.c
@@ -29,6 +29,7 @@ const char *git_log_output_encoding;
int shared_repository = PERM_UMASK;
const char *apply_default_whitespace;
const char *apply_default_ignorewhitespace;
+const char *git_attributes_file;
int zlib_compression_level = Z_BEST_SPEED;
int core_compression_level;
int core_compression_seen;