Merge branch 'jh/maint-do-not-track-non-branches'

author Junio C Hamano <gitster@pobox.com>

Tue, 15 Mar 2011 21:22:13 +0000 (14:22 -0700)

committer Junio C Hamano <gitster@pobox.com>

Tue, 15 Mar 2011 21:22:13 +0000 (14:22 -0700)
author Junio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:13 +0000 (14:22 -0700)
committer Junio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:13 +0000 (14:22 -0700)
diff --cc branch.c
Simple merge
diff --cc t/t3200-branch.sh
Simple merge
diff --cc t/t6040-tracking-info.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Tue, 15 Mar 2011 21:22:13 +0000 (14:22 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 15 Mar 2011 21:22:13 +0000 (14:22 -0700)
		1	2
branch.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t3200-branch.sh	patch \|	diff1 \|	diff2 \|	blob \| history
t/t6040-tracking-info.sh	patch \|	diff1 \|	diff2 \|	blob \| history