Merge branch 'sg/maint-gitdir-in-subdir' into maint
commitf20408dadb75914460b9251b56fe4bffb5f44f48
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 02:05:43 +0000 (5 18:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 02:05:43 +0000 (5 18:05 -0800)
tree7241fcb8d3ec78b25c5504d2985caebef2965cbe
parent141b6b83d7ca5bd32d55a0a7e08384084d081557
parent72183cb297f614dc2df1c0ed08afac1be27ec35a
Merge branch 'sg/maint-gitdir-in-subdir' into maint

* sg/maint-gitdir-in-subdir:
  Fix gitdir detection when in subdir of gitdir
setup.c
t/t1501-worktree.sh