Merge branch 'ds/doc-two-kinds-of-tags'
authorJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2013 19:38:21 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2013 19:38:21 +0000 (12:38 -0700)
* ds/doc-two-kinds-of-tags:
docs/git-tag: explain lightweight versus annotated tags

1  2 
Documentation/git-tag.txt
Simple merge