Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
commit801bad3ba4eb5014d402201c85c61a969436adf0
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:25:37 +0000 (4 22:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:25:37 +0000 (4 22:25 -0800)
tree647c5370bb49b784401910fc500727a8bf3e49a0
parentce5044df2a29c4f4979089b072aad43bccb3b9fd
parentab62677b1424d4e53cf222c973b841d3dada4cf3
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint

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