summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-07 02:17:14 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-07 02:17:14 -0700
commit5e97f464df082d8f45e163bbf24341dceeafe89d (patch)
tree337339e077105f3b6c1bcc2741dffcaf95f411f1 /cache.h
parent5f2f71f6af0fc66cf4c590a1806ee18b197e086e (diff)
parentdc87183189b54441e315d35d48983d80ab085299 (diff)
downloadgit-5e97f464df082d8f45e163bbf24341dceeafe89d.tar.gz
Merge branch 'db/no-git-config'
* db/no-git-config: Only use GIT_CONFIG in "git config", not other programs Conflicts: Documentation/RelNotes-1.6.0.txt
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 35a91320a5..96c43884cc 100644
--- a/cache.h
+++ b/cache.h
@@ -298,7 +298,6 @@ static inline enum object_type object_type(unsigned int mode)
#define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
#define TEMPLATE_DIR_ENVIRONMENT "GIT_TEMPLATE_DIR"
#define CONFIG_ENVIRONMENT "GIT_CONFIG"
-#define CONFIG_LOCAL_ENVIRONMENT "GIT_CONFIG_LOCAL"
#define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
#define GITATTRIBUTES_FILE ".gitattributes"
#define INFOATTRIBUTES_FILE "info/attributes"
@@ -743,6 +742,7 @@ extern int check_repository_format_version(const char *var, const char *value, v
extern int git_config_system(void);
extern int git_config_global(void);
extern int config_error_nonbool(const char *);
+extern const char *config_exclusive_filename;
#define MAX_GITNAME (1000)
extern char git_default_email[MAX_GITNAME];