| commit | fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Feb 2008 01:56:51 +0000 (16 17:56 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Feb 2008 01:56:51 +0000 (16 17:56 -0800) | ||
| tree | a3c4cf94132da5755e874ef44bd8072d679ba0c8 | treesnapshot (tar.gz zip) |
| parent | 093d50e0d226b879e24753ce18f4eb4b754807c6 | commitdiff |
| parent | 8bfa6bd6473b086ab2c5781daa08a7b5417c3d1f | commitdiff |
Merge branch 'jk/noetcconfig'
* jk/noetcconfig:
fix config reading in tests
allow suppressing of global and system config
Conflicts:
cache.h
* jk/noetcconfig:
fix config reading in tests
allow suppressing of global and system config
Conflicts:
cache.h
| builtin-config.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| config.c | diff1 | diff2 | blobhistory |