Merge branch 'tg/tag-points-at'

author Junio C Hamano <gitster@pobox.com>

Mon, 20 Feb 2012 08:15:28 +0000 (00:15 -0800)

committer Junio C Hamano <gitster@pobox.com>

Mon, 20 Feb 2012 08:15:28 +0000 (00:15 -0800)
author Junio C Hamano <gitster@pobox.com>
Mon, 20 Feb 2012 08:15:28 +0000 (00:15 -0800)
committer Junio C Hamano <gitster@pobox.com>
Mon, 20 Feb 2012 08:15:28 +0000 (00:15 -0800)
diff --cc builtin/tag.c
Simple merge
diff --cc t/t7004-tag.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Mon, 20 Feb 2012 08:15:28 +0000 (00:15 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 20 Feb 2012 08:15:28 +0000 (00:15 -0800)
		1	2
builtin/tag.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t7004-tag.sh	patch \|	diff1 \|	diff2 \|	blob \| history