Code

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