aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-24 01:43:28 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-24 01:43:28 -0800
commitcc58fc0684396c5298b21c97f00a568e46224258 (patch)
treeeae57897af7ed7fab38e3ce34328ef4f274fa25e /Documentation/config.txt
parent8a13becc0dd4c8876ebf471bf880446c1a10b7e9 (diff)
parent8565d2d853d85f246faa9bcde91aba3415a24d54 (diff)
downloadgit-cc58fc0684396c5298b21c97f00a568e46224258.tar.gz
git-cc58fc0684396c5298b21c97f00a568e46224258.tar.xz
Merge branch 'js/etc-config'
* js/etc-config: Make tests independent of global config files config: read system-wide defaults from /etc/gitconfig
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 70f548464..6309d89b4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -5,7 +5,8 @@ The git configuration file contains a number of variables that affect
the git command's behavior. `.git/config` file for each repository
is used to store the information for that repository, and
`$HOME/.gitconfig` is used to store per user information to give
-fallback values for `.git/config` file.
+fallback values for `.git/config` file. The file `/etc/gitconfig`
+can be used to store system-wide defaults.
They can be used by both the git plumbing
and the porcelains. The variables are divided into sections, where