Merge branch 'jk/config-include' into next
commit7b150b7668dd4c7b7830fb4995060efae63cc095
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Feb 2012 08:46:00 +0000 (20 00:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Feb 2012 08:46:00 +0000 (20 00:46 -0800)
treee15d370c06a20ffaf12212b11fdb8361819c5018
parentba040ae9e41d3d556111e44f431661e5f21456b8
parent9b25a0b52e09400719366f0a33d0d0da98bbf7b0
Merge branch 'jk/config-include' into next

* jk/config-include:
  config: add include directive
  config: eliminate config_exclusive_filename
  config: stop using config_exclusive_filename
  config: provide a version of git_config with more options
  config: teach git_config_rename_section a file argument
  config: teach git_config_set_multivar_in_file a default path
  config: copy the return value of prefix_filename
  t1300: add missing &&-chaining
  docs/api-config: minor clarifications
cache.h