| commit | 25b86e45f46235334d06c21f888c9ced241b7868 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 May 2011 23:30:18 +0000 (25 16:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 May 2011 23:30:18 +0000 (25 16:30 -0700) | ||
| tree | 75af6a44b0f7c717bf8eb50ae5640bd87884ce9b | treesnapshot (tar.gz zip) |
| parent | c60969aa79c6161856ed2f6e26ffb662542ea6e4 | commitdiff |
| parent | 73546c085d49694c5e54b421f80bde6bc25006fb | commitdiff |
Merge branch 'jk/maint-config-alias-fix' into next
* 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
* 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
| cache.h | diff1 | diff2 | blobhistory |
| config.c | diff1 | diff2 | blobhistory |
| git.c | diff1 | diff2 | blobhistory |
| t/t1300-repo-config.sh | diff1 | diff2 | blobhistory |