From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Oct 2013 22:45:55 +0000 (-0700)
Subject: Merge branch 'nd/git-dir-pointing-at-gitfile' into maint
X-Git-Tag: v1.8.4.2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8aeacfa1f1e7b1f2d7b0c5fbb7becbbc6248183;p=git

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
---

f8aeacfa1f1e7b1f2d7b0c5fbb7becbbc6248183