Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:25:37 +0000 (22:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:25:37 +0000 (22:25 -0800)
* gf/maint-sh-setup-nongit-ok:
  require_work_tree broken with NONGIT_OK

1  2 
git-sh-setup.sh

diff --cc git-sh-setup.sh
Simple merge