]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8322bfb b542e46)
Merge branch 'cl/conditional-config-on-worktree-path' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2026 00:12:09 +0000 (09:12 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2026 00:12:09 +0000 (09:12 +0900)
commit7851f494ae7e68980fadee793cebbfcc325bcfe3
tree84431f9c56cec200309a8a99b633c618d96a443dtree | snapshot
parent8322bfb8f22ac0ce7e626652e7d07c15e935e759commit | diff
parentb542e46bdbcbfb359d1f6d5dcc5538d3f5cafa62commit | diff
Merge branch 'cl/conditional-config-on-worktree-path' into next

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