Merge branch 'nd/conditional-config-include'
commit4b7989b10321e5558fc00c93408c6631f9fc604d
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:07:18 +0000 (21 15:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:07:18 +0000 (21 15:07 -0700)
treeb19ceef948a6476d1756d976ef9b7b093f81276f
parent45cbc37c5f84fadd78cccf6b2ea82a9ef251cdc6
parent3efd0bedc6625a6b194c1f6e5f1b7aa7d8b7e6bb
Merge branch 'nd/conditional-config-include'

The configuration file learned a new "includeIf.<condition>.path"
that includes the contents of the given path only when the
condition holds.  This allows you to say "include this work-related
bit only in the repositories under my ~/work/ directory".

* nd/conditional-config-include:
  config: add conditional include
  config.txt: reflow the second include.path paragraph
  config.txt: clarify multiple key values in include.path
Documentation/config.txt
config.c