From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Feb 2012 21:30:14 +0000 (-0800)
Subject: Merge branch 'jk/config-include'
X-Git-Tag: v1.7.10-rc0~52
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fd1727f5fa1ca1817eee36f99c9245dc2217ecac;p=git.git

Merge branch 'jk/config-include'

* jk/config-include:
  : An assignment to the include.path pseudo-variable causes the named file
  : to be included in-place when Git looks up configuration variables.
  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
  docs: add a basic description of the config API
---

fd1727f5fa1ca1817eee36f99c9245dc2217ecac