From 09b0eb0d1ac7a66569263d2c48aea96e524ccebe Mon Sep 17 00:00:00 2001 From: kemal Date: Tue, 8 Jun 2021 20:13:57 +0000 Subject: git/conf: check in /sys/lib/git/config as a fallback to user-wide config --- sys/man/1/git | 6 +++++- sys/src/cmd/git/conf.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/man/1/git b/sys/man/1/git index ad903a44d..eda0c7e81 100644 --- a/sys/man/1/git +++ b/sys/man/1/git @@ -631,8 +631,12 @@ $repo/.git/config The configuration file for a repository. .TP $home/lib/git/config -The global configuration for git. +The user-wide configuration for git. The contents of this file are used as fallbacks for the per-repository config. +.TP +/sys/lib/git/config +The system-wide configuration for git. +The contents of this file are used as fallbacks for the per-user config. .SH SEE ALSO .IR hg (1) diff --git a/sys/src/cmd/git/conf.c b/sys/src/cmd/git/conf.c index cecc1b694..63cf475d5 100644 --- a/sys/src/cmd/git/conf.c +++ b/sys/src/cmd/git/conf.c @@ -78,6 +78,7 @@ main(int argc, char **argv) file[nfile++] = ".git/config"; if((p = getenv("home")) != nil) file[nfile++] = smprint("%s/lib/git/config", p); + file[nfile++] = "/sys/lib/git/config"; } for(i = 0; i < argc; i++){ -- cgit v1.2.3