Merge branch 'ks/tag-cleanup' into next
commitcbea0455f4aa0007246a7bc6be56a00fa7cf07d3
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 22:19:28 +0000 (9 14:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 22:19:28 +0000 (9 14:19 -0800)
tree3130e27be526b9376826ddb69590073694a73ee5
parent53eb3b3791641e81f055f87a9edb9a7f4604aec5
parentd3e05983306537c8ec911fc52092697ba80830fa
Merge branch 'ks/tag-cleanup' into next

* ks/tag-cleanup:
  git-tag: introduce --cleanup option

Conflicts:
builtin/tag.c
builtin/tag.c