]> git.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d9dd6d 487a2b7)
Merge branch 'nd/git-dir-pointing-at-gitfile' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:45:55 +0000 (15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:45:55 +0000 (15:45 -0700)
* nd/git-dir-pointing-at-gitfile:
  Make setup_git_env() resolve .git file when $GIT_DIR is not specified

1  2 
environment.c patch | diff1 | diff2 | blob | history

diff --cc environment.c
Simple merge
mirror of git://git.kernel.org/pub/scm/git/git.git