From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Mar 2017 22:07:18 +0000 (-0700)
Subject: Merge branch 'nd/conditional-config-include'
X-Git-Tag: v2.13.0-rc0~91
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4b7989b10321e5558fc00c93408c6631f9fc604d

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
---

4b7989b10321e5558fc00c93408c6631f9fc604d