Merge branch 'jk/doc-config-include'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:47 +0000 (12:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:47 +0000 (12:34 +0900)
commited9806014d06fb1757a45d7f789859b91d9fb765
tree577a175c0fc199fd5f7c2c9d4645da85e1ca79df
parente6f9c8d7f5680a49df58c381e14223467953371c
parentce933ebd5a4a68a1042661499c05368bb60fd523
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
Documentation/config.txt