From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Oct 2007 04:38:11 +0000 (-0700)
Subject: Merge branch 'nd/worktree' into HEAD
X-Git-Tag: v1.5.4-rc0~298
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7eedc1c1b34bbcd72b66a5dbf10b21476c10df1a;p=git.git

Merge branch 'nd/worktree' into HEAD

* nd/worktree:
  git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
---

7eedc1c1b34bbcd72b66a5dbf10b21476c10df1a