Merge branch 'tg/tag-points-at'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Feb 2012 08:15:28 +0000 (00:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Feb 2012 08:15:28 +0000 (00:15 -0800)
* tg/tag-points-at:
  builtin/tag.c: Fix a sparse warning
  tag: add --points-at list option

1  2 
builtin/tag.c
t/t7004-tag.sh

diff --cc builtin/tag.c
Simple merge
diff --cc t/t7004-tag.sh
Simple merge