From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Apr 2026 01:21:56 +0000 (+0900)
Subject: Merge branch 'cl/conditional-config-on-worktree-path' into seen
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d941ca65112c1c207e8af8fb82a87f12d6f4826c;p=thirdparty%2Fgit.git

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

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()
---

d941ca65112c1c207e8af8fb82a87f12d6f4826c