summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-07 09:17:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-07 09:17:14 (GMT)
commit5e97f464df082d8f45e163bbf24341dceeafe89d (patch)
tree337339e077105f3b6c1bcc2741dffcaf95f411f1 /Documentation
parent5f2f71f6af0fc66cf4c590a1806ee18b197e086e (diff)
parentdc87183189b54441e315d35d48983d80ab085299 (diff)
downloadgit-5e97f464df082d8f45e163bbf24341dceeafe89d.zip
git-5e97f464df082d8f45e163bbf24341dceeafe89d.tar.gz
git-5e97f464df082d8f45e163bbf24341dceeafe89d.tar.bz2
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')
-rw-r--r--Documentation/RelNotes-1.6.0.txt5
-rw-r--r--Documentation/git-config.txt9
2 files changed, 5 insertions, 9 deletions
diff --git a/Documentation/RelNotes-1.6.0.txt b/Documentation/RelNotes-1.6.0.txt
index e5c285f..a8bda44 100644
--- a/Documentation/RelNotes-1.6.0.txt
+++ b/Documentation/RelNotes-1.6.0.txt
@@ -23,6 +23,11 @@ encoding introduced in v1.4.4. Pack idx files are using version 2 that
allows larger packs and added robustness thanks to its CRC checking,
introduced in v1.5.2.
+GIT_CONFIG, which was only documented as affecting "git config", but
+actually affected all git commands, now only affects "git config".
+GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
+not different from GIT_CONFIG in a useful way, is removed.
+
Updates since v1.5.6
--------------------
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index df419e2..697824c 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>>.