]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jt/conditional-config-on-remote-url'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Feb 2022 22:20:58 +0000 (14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Feb 2022 22:20:59 +0000 (14:20 -0800)
The conditional inclusion mechanism of configuration files using
"[includeIf <condition>]" learns to base its decision on the
URL of the remote repository the repository interacts with.

* jt/conditional-config-on-remote-url:
  config: include file if remote URL matches a glob
  config: make git_config_include() static

1  2 
Documentation/config.txt
config.c
t/t1300-config.sh

Simple merge
diff --cc config.c
Simple merge
Simple merge