author | Junio C Hamano <gitster@pobox.com> | |
Wed, 1 Jun 2011 21:05:22 +0000 (14:05 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 1 Jun 2011 21:05:22 +0000 (14:05 -0700) | ||
commit | 1c6e3514d093377fec5e30aa02a119187cf743f2 | |
tree | fe3865b32c4690dce137a173d86f3876578cf02c | tree | snapshot |
parent | 6e1a7510b1dd830de69e174e409a40eb580c3ba7 | commit | diff |
parent | 73546c085d49694c5e54b421f80bde6bc25006fb | commit | diff |
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
* 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
cache.h | diff1 | | diff2 | | blob | history |
config.c | diff1 | | diff2 | | blob | history |
git.c | diff1 | | diff2 | | blob | history |
t/t1300-repo-config.sh | diff1 | | diff2 | | blob | history |