From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Mar 2010 20:44:07 +0000 (-0800)
Subject: Merge branch 'gf/maint-sh-setup-nongit-ok'
X-Git-Tag: v1.7.1-rc0~120
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8acd141bb5cd4155d849fbfb3b74eb509608cd15;p=git.git

Merge branch 'gf/maint-sh-setup-nongit-ok'

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

8acd141bb5cd4155d849fbfb3b74eb509608cd15
diff --cc git-sh-setup.sh
index d56426dd3,d2789410d..5e22440ae
mode 100644,100755..100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh