summaryrefslogtreecommitdiff
path: root/builtin/ls-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 18:24:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-22 18:24:09 (GMT)
commitc714f9fd8addc752aaaf1f97bb2be311d9156def (patch)
tree7ec7cf29beede6f5a38729172db8cfd7e4794017 /builtin/ls-files.c
parent4c72ee838f1085a47a3c5144ce1088f1bca42f66 (diff)
parentb2dc09455a9ed5521c2e84fc67d8dacf2c28c39f (diff)
downloadgit-c714f9fd8addc752aaaf1f97bb2be311d9156def.zip
git-c714f9fd8addc752aaaf1f97bb2be311d9156def.tar.gz
git-c714f9fd8addc752aaaf1f97bb2be311d9156def.tar.bz2
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
Diffstat (limited to 'builtin/ls-files.c')
0 files changed, 0 insertions, 0 deletions