diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:05:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:05:22 -0700 |
| commit | 1c6e3514d093377fec5e30aa02a119187cf743f2 (patch) | |
| tree | fe3865b32c4690dce137a173d86f3876578cf02c /cache.h | |
| parent | 6e1a7510b1dd830de69e174e409a40eb580c3ba7 (diff) | |
| parent | 73546c085d49694c5e54b421f80bde6bc25006fb (diff) | |
| download | git-1c6e3514d093377fec5e30aa02a119187cf743f2.tar.gz git-1c6e3514d093377fec5e30aa02a119187cf743f2.tar.xz | |
Merge branch 'jk/maint-config-alias-fix' into maint
* 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
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1007,8 +1007,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); |