![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 31 Oct 2007 04:38:11 +0000 (21:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 31 Oct 2007 04:38:11 +0000 (21:38 -0700) | ||
| commit | 7eedc1c1b34bbcd72b66a5dbf10b21476c10df1a | |
| tree | de96df028bd6cdd60f6d7d74571d3c5a100a5460 | tree | snapshot |
| parent | 9725bb8b854ce9bb3642bc0e167e7d791e54c7a1 | commit | diff |
| parent | 6b9ff1e3bd089d1bef211ba74c12e056810755b8 | commit | diff |
Merge branch 'nd/worktree' into HEAD
* nd/worktree:
git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
* nd/worktree:
git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK