From a4ec858e0d81776216956e1e9b33aa1139d31ef4 Mon Sep 17 00:00:00 2001 From: Bryan Ross Date: Tue, 6 Oct 2015 11:49:22 -0600 Subject: [PATCH] add note about %PROGRAMDATA%\Git\config to git-config.txt --- Documentation/config.txt | 2 +- Documentation/git-config.txt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 079c28e47fb0c7..bc8c5617db9825 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -7,7 +7,7 @@ is used to store the configuration for that repository, and `$HOME/.gitconfig` is used to store a per-user configuration as fallback values for the `.git/config` file. The file `/etc/gitconfig` can be used to store a system-wide default configuration. On Windows, -configuration can also be stored in `C:\ProgramData\Git\config`; This +configuration can also be stored in `%PROGRAMDATA%\Git\config`; This file will be used also by libgit2-based software. The configuration variables are used by both the Git plumbing diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 352f7392aaf7ef..df37579904d8f3 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -247,9 +247,10 @@ $GIT_DIR/config:: Repository specific configuration file. On Windows, as there is no central `/etc/` directory, there is yet another -config file, intended to contain settings for *all* Git-related software -running on the machine. Consequently, this config file takes an even lower -precedence than the `$(prefix)/etc/gitconfig` file. +config file (located at `%PROGRAMDATA%\Git\config`), intended to contain +settings for *all* Git-related software running on the machine. Consequently, +this config file takes an even lower precedence than the +`$(prefix)/etc/gitconfig` file. If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration