From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Jul 2026 17:30:52 +0000 (-0700)
Subject: Merge branch 'cl/conditional-config-on-worktree-path'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccf9746c673c5bb83000a41562b0df5339aef6ec;p=thirdparty%2Fgit.git

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

ccf9746c673c5bb83000a41562b0df5339aef6ec