Merge branch 'db/no-git-config'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Jul 2008 09:17:14 +0000 (02:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Jul 2008 09:17:14 +0000 (02:17 -0700)
commit5e97f464df082d8f45e163bbf24341dceeafe89d
tree337339e077105f3b6c1bcc2741dffcaf95f411f1
parent5f2f71f6af0fc66cf4c590a1806ee18b197e086e
parentdc87183189b54441e315d35d48983d80ab085299
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
Documentation/RelNotes-1.6.0.txt
Documentation/git-config.txt
cache.h