![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 May 2011 03:19:14 +0000 (20:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 May 2011 03:19:14 +0000 (20:19 -0700) | ||
| commit | 1f9a980636d39c08c1cf1c13a6e6584d9d039e0e | |
| tree | 97f906828fd6ad4166101e7e5d86a7a4b9671079 | tree | snapshot |
| parent | fb674d767180354d9ad3e69f1d41bee98df6bfe9 | commit | diff |
| parent | 73546c085d49694c5e54b421f80bde6bc25006fb | commit | diff |
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
* 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 | | blob | history |
| config.c | diff1 | | diff2 | | blob | history |
| git.c | diff1 | | diff2 | | blob | history |
| t/t1300-repo-config.sh | diff1 | | diff2 | | blob | history |