From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 May 2017 03:34:47 +0000 (+0900)
Subject: Merge branch 'jk/doc-config-include'
X-Git-Tag: v2.14.0-rc0~159
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ed9806014d06fb1757a45d7f789859b91d9fb765;p=git-core%2Fgit.git

Merge branch 'jk/doc-config-include'

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

ed9806014d06fb1757a45d7f789859b91d9fb765