]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 268fbd3 8ab3dff)
Merge branch 'cl/conditional-config-on-worktree-path' into seen
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 May 2026 04:01:39 +0000 (13:01 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 May 2026 04:01:39 +0000 (13:01 +0900)
commit912bf33d49cf79aebddd141c469a55f6f7756139
tree857d5b83f2bfd5030865c4108a0fd5f1c117b776tree | snapshot
parent268fbd3d1b935cf3fac7659c1fe57401f720f58dcommit | diff
parent8ab3dff1f1fb800fdc82c20f2526b8a55b4d37b5commit | diff
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.

Ready?

* cl/conditional-config-on-worktree-path:
  config: add "worktree" and "worktree/i" includeIf conditions
  config: refactor include_by_gitdir() into include_by_path()
Documentation/config.adoc diff1 | diff2 | blob | history
config.c diff1 | diff2 | blob | history
t/t1305-config-include.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.