Merge branch 'sg/maint-gitdir-in-subdir' into maint

author Junio C Hamano <gitster@pobox.com>

Fri, 6 Feb 2009 02:05:43 +0000 (18:05 -0800)

committer Junio C Hamano <gitster@pobox.com>

Fri, 6 Feb 2009 02:05:43 +0000 (18:05 -0800)
author Junio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 02:05:43 +0000 (18:05 -0800)
committer Junio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 02:05:43 +0000 (18:05 -0800)
diff --cc setup.c
Simple merge
diff --cc t/t1501-worktree.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Fri, 6 Feb 2009 02:05:43 +0000 (18:05 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 6 Feb 2009 02:05:43 +0000 (18:05 -0800)
		1	2
setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t1501-worktree.sh	patch \|	diff1 \|	diff2 \|	blob \| history