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

Junio C Hamano committed Jun 4, 2017 at 10:21 UTC aa5439d623ee297bc225f26c06981877f72ccf1b

No changes.