| commit | c714f9fd8addc752aaaf1f97bb2be311d9156def | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Jul 2013 18:24:09 +0000 (22 11:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Jul 2013 18:24:09 +0000 (22 11:24 -0700) | ||
| tree | 7ec7cf29beede6f5a38729172db8cfd7e4794017 | treesnapshot (tar.gz zip) |
| parent | 4c72ee838f1085a47a3c5144ce1088f1bca42f66 | commitdiff |
| parent | b2dc09455a9ed5521c2e84fc67d8dacf2c28c39f | commitdiff |
Merge branch 'hv/config-from-blob'
Allow configuration data to be read from in-tree blob objects,
which would help working in a bare repository and submodule
updates.
* hv/config-from-blob:
do not die when error in config parsing of buf occurs
teach config --blob option to parse config from database
config: make parsing stack struct independent from actual data source
config: drop cf validity check in get_next_char()
config: factor out config file stack management
Allow configuration data to be read from in-tree blob objects,
which would help working in a bare repository and submodule
updates.
* hv/config-from-blob:
do not die when error in config parsing of buf occurs
teach config --blob option to parse config from database
config: make parsing stack struct independent from actual data source
config: drop cf validity check in get_next_char()
config: factor out config file stack management
| Documentation/git-config.txt | diff1 | diff2 | blobhistory |
| builtin/config.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| config.c | diff1 | diff2 | blobhistory |