Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Dec 2015 21:39:47 +0000 (13:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Dec 2015 21:40:12 +0000 (13:40 -0800)
* nd/stop-setenv-work-tree:
Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"

1  2 
environment.c
diff --cc environment.c
Simple merge