Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6
commitb7380fa7a9adb52860eef7e8885fb8bc179beae1
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 22:53:53 +0000 (7 14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 22:53:53 +0000 (7 14:53 -0800)
tree524e160bc3c08a540ee12b59e8057b2ba9b5413a
parentcb16bcc36965f28845e4fae15c36280a2506f1be
parentab62677b1424d4e53cf222c973b841d3dada4cf3
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6

* gf/maint-sh-setup-nongit-ok:
  require_work_tree broken with NONGIT_OK
git-sh-setup.sh