From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jun 2026 23:14:09 +0000 (+0900)
Subject: Merge branch 'cl/conditional-config-on-worktree-path' into seen
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=6d594e379ff0d8dd18e81fa84df90bf1ed1a9374;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.

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

6d594e379ff0d8dd18e81fa84df90bf1ed1a9374