summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-31 03:19:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-31 03:19:14 (GMT)
commit1f9a980636d39c08c1cf1c13a6e6584d9d039e0e (patch)
tree97f906828fd6ad4166101e7e5d86a7a4b9671079 /cache.h
parentfb674d767180354d9ad3e69f1d41bee98df6bfe9 (diff)
parent73546c085d49694c5e54b421f80bde6bc25006fb (diff)
downloadgit-1f9a980636d39c08c1cf1c13a6e6584d9d039e0e.zip
git-1f9a980636d39c08c1cf1c13a6e6584d9d039e0e.tar.gz
git-1f9a980636d39c08c1cf1c13a6e6584d9d039e0e.tar.bz2
Merge branch 'jk/maint-config-alias-fix'
* jk/maint-config-alias-fix: handle_options(): do not miscount how many arguments were used config: always parse GIT_CONFIG_PARAMETERS during git_config git_config: don't peek at global config_parameters config: make environment parsing routines static Conflicts: config.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 009b365..e11cf6a 100644
--- a/cache.h
+++ b/cache.h
@@ -1040,8 +1040,6 @@ typedef int (*config_fn_t)(const char *, const char *, void *);
extern int git_default_config(const char *, const char *, void *);
extern int git_config_from_file(config_fn_t fn, const char *, void *);
extern void git_config_push_parameter(const char *text);
-extern int git_config_parse_parameter(const char *text);
-extern int git_config_parse_environment(void);
extern int git_config_from_parameters(config_fn_t fn, void *data);
extern int git_config(config_fn_t fn, void *);
extern int git_config_early(config_fn_t fn, void *, const char *repo_config);