From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Jun 2017 01:21:02 +0000 (+0900)
Subject: Merge branch 'jk/doc-config-include' into maint
X-Git-Tag: v2.13.1~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa5439d623ee297bc225f26c06981877f72ccf1b;p=thirdparty%2Fgit.git

Merge branch 'jk/doc-config-include' into maint

Clarify documentation for include.path and includeIf.<condition>.path
configuration variables.

* jk/doc-config-include:
  docs/config: consistify include.path examples
  docs/config: avoid the term "expand" for includes
  docs/config: give a relative includeIf example
  docs/config: clarify include/includeIf relationship
---

aa5439d623ee297bc225f26c06981877f72ccf1b