]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aebf83d 5004829)
Merge branch 'cl/conditional-config-on-worktree-path'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Jul 2026 17:30:52 +0000 (10:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jul 2026 17:30:53 +0000 (10:30 -0700)
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()

1  2 
t/t1305-config-include.sh patch | diff1 | diff2 | blob | history

diff --cc t/t1305-config-include.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.