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

diff --cc Documentation/RelNotes-1.6.0.txt
index e5c285f9c042c71cf6c67b0e2292d2876ec739b1,d37aa46a289f456f7618c156b41d17292178dc84..a8bda44961b9fcc0c0352bdd193c511edc3fa18f
--- 1/Documentation/RelNotes-1.6.0.txt
--- 2/Documentation/RelNotes-1.6.0.txt
+++ b/Documentation/RelNotes-1.6.0.txt
@@@ -18,11 -21,11 +18,16 @@@ scripts to use "git xyzzy" form, as we 
  Source changes needed for porting to MinGW environment are now all in the
  main git.git codebase.
  
 +By default, packfiles created with this version uses delta-base-offset
 +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 --cc Documentation/git-config.txt
Simple merge

diff --cc cache.h
Simple merge