From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Apr 2026 18:22:17 +0000 (-0700)
Subject: Merge branch 'cl/conditional-config-on-worktree-path' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83b2df84340a7587ddba711b7f88806e4e760676;p=thirdparty%2Fgit.git

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

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

Comments?

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

83b2df84340a7587ddba711b7f88806e4e760676