Merge branch 'nd/worktree' into HEAD
commit7eedc1c1b34bbcd72b66a5dbf10b21476c10df1a
authorJunio C Hamano <gitster@pobox.com>
Wed, 31 Oct 2007 04:38:11 +0000 (30 21:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Oct 2007 04:38:11 +0000 (30 21:38 -0700)
treede96df028bd6cdd60f6d7d74571d3c5a100a5460
parent9725bb8b854ce9bb3642bc0e167e7d791e54c7a1
parent6b9ff1e3bd089d1bef211ba74c12e056810755b8
Merge branch 'nd/worktree' into HEAD

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