diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-07 02:17:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 02:17:14 -0700 |
| commit | 5e97f464df082d8f45e163bbf24341dceeafe89d (patch) | |
| tree | 337339e077105f3b6c1bcc2741dffcaf95f411f1 /Documentation/git-config.txt | |
| parent | 5f2f71f6af0fc66cf4c590a1806ee18b197e086e (diff) | |
| parent | dc87183189b54441e315d35d48983d80ab085299 (diff) | |
| download | git-5e97f464df082d8f45e163bbf24341dceeafe89d.tar.gz git-5e97f464df082d8f45e163bbf24341dceeafe89d.tar.xz | |
Merge branch 'db/no-git-config'
* db/no-git-config:
Only use GIT_CONFIG in "git config", not other programs
Conflicts:
Documentation/RelNotes-1.6.0.txt
Diffstat (limited to 'Documentation/git-config.txt')
| -rw-r--r-- | Documentation/git-config.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index df419e21f..697824cba 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -191,11 +191,6 @@ variables. The '--global' and the '--system' options will limit the file used to the global or system-wide file respectively. The GIT_CONFIG environment variable has a similar effect, but you can specify any filename you want. -The GIT_CONFIG_LOCAL environment variable on the other hand only changes -the name used instead of the repository configuration file. The global and -the system-wide configuration files will still be read. (For writing options -this will obviously result in the same behavior as using GIT_CONFIG.) - ENVIRONMENT ----------- @@ -205,10 +200,6 @@ GIT_CONFIG:: Using the "--global" option forces this to ~/.gitconfig. Using the "--system" option forces this to $(prefix)/etc/gitconfig. -GIT_CONFIG_LOCAL:: - Take the configuration from the given file instead if .git/config. - Still read the global and the system-wide configuration files, though. - See also <<FILES>>. |