Merge branch 'sg/maint-gitdir-in-subdir'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 00:51:25 +0000 (16:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 00:51:25 +0000 (16:51 -0800)
commit0aac1614e976164259edf5f950da4cbebe069466
tree50f0dd772ab75c2086458b51b421bde6863574ed
parent07adc43f3a17a34111e17eadef3f6f4eef3eb67a
parent72183cb297f614dc2df1c0ed08afac1be27ec35a
Merge branch 'sg/maint-gitdir-in-subdir'

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