tree 6cd7f3608c26775c05936b281a04c7fc05fd988a
parent aebf83d00a707e6ba232f07dc439ddcf8cf4bbbd
parent 5004829756596498a20305b3fce8387629396835
author Junio C Hamano <gitster@pobox.com> 1784741452 -0700
committer Junio C Hamano <gitster@pobox.com> 1784741453 -0700

Merge branch 'cl/conditional-config-on-worktree-path'

The '[includeIf "condition"]' conditional inclusion facility for
configuration files has been taught to use the location of the
worktree in its condition.

* cl/conditional-config-on-worktree-path:
  config: add "worktree" and "worktree/i" includeIf conditions
  config: refactor include_by_gitdir() into include_by_path()