Merge branch 'ps/config-global-override'
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 May 2021 03:47:39 +0000 (12:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 May 2021 03:47:39 +0000 (12:47 +0900)
commite706aaf3bc8ad97877cbf21887f96c5af66c7562
tree2d59cb87fcea92978ae4b9ed202a6993a627f5e5
parentf16a4660de5751ca8c5229698d97b02e6676298c
parent482d5499067b2a1fc8d1ebfb5160022dc23ab136
Merge branch 'ps/config-global-override'

Replace GIT_CONFIG_NOSYSTEM mechanism to decline from reading the
system-wide configuration file with GIT_CONFIG_SYSTEM that lets
users specify from which file to read the system-wide configuration
(setting it to an empty file would essentially be the same as
setting NOSYSTEM), and introduce GIT_CONFIG_GLOBAL to override the
per-user configuration in $HOME/.gitconfig.

* ps/config-global-override:
  t1300: fix unset of GIT_CONFIG_NOSYSTEM leaking into subsequent tests
  config: allow overriding of global and system configuration
  config: unify code paths to get global config paths
  config: rename `git_etc_config()`
Documentation/git.txt
config.c
t/t1300-config.sh