Merge branch 'jk/config-include' into next
commit307ddf6cbbe49da06057c1c50a8ad28b6a7ec1e3
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 19:53:24 +0000 (13 11:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 19:53:24 +0000 (13 11:53 -0800)
treef64e031a6cd6a87889b607c9f0598d17f97c8713
parenta8f40461eea059bb830dcf4b93d2bc052594f048
parent5d22f812d426103a29dcce50db47e5274ebaf67b
Merge branch 'jk/config-include' into next

* jk/config-include:
  config: add include directive
  docs: add a basic description of the config API
cache.h