Merge branch 'jk/doc-config-include' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:21:02 +0000 (10:21 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:21:02 +0000 (10:21 +0900)
commitaa5439d623ee297bc225f26c06981877f72ccf1b
tree5981d2767be8b0d4e6ff2db31f21334350d899c6
parentf305016f428db71df44d3e0072e937a8739b4e1a
parentce933ebd5a4a68a1042661499c05368bb60fd523
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