Merge branch 'nd/git-dir-pointing-at-gitfile' into maint
commitf8aeacfa1f1e7b1f2d7b0c5fbb7becbbc6248183
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:45:55 +0000 (17 15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:45:55 +0000 (17 15:45 -0700)
treec9d1898aecd8d05574450db74d26c1f2c8d88741
parent7d9dd6da4a02d26b6841b67f6b1a8c5773114d3e
parent487a2b732230608fe7f2cdc46c9f11bd646cb1ac
Merge branch 'nd/git-dir-pointing-at-gitfile' into maint

* nd/git-dir-pointing-at-gitfile:
  Make setup_git_env() resolve .git file when $GIT_DIR is not specified
environment.c