Merge branch 'gf/maint-sh-setup-nongit-ok' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Feb 2010 21:20:48 +0000 (13:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Feb 2010 21:20:48 +0000 (13:20 -0800)
commitaca55e690dbd3e1a81b5fdea0f06552f94a4af27
tree344ee4a6b6a768970f710c8b3ed89ac6d4054e66
parentdb276f4ab7e2a5d2417bf9a81329c3a86799a7cd
parentab62677b1424d4e53cf222c973b841d3dada4cf3
Merge branch 'gf/maint-sh-setup-nongit-ok' into next

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