Merge branch 'ds/doc-two-kinds-of-tags'
commit652d2bfa83e92d871eb034e13fd811fbd402c3f1
authorJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2013 19:38:21 +0000 (31 12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2013 19:38:21 +0000 (31 12:38 -0700)
tree8677166b55947468619583f76b20f085e55b0306
parent5ecc4b53f77d939dfad2819658cc51f4053a03f3
parent29d55538b78fa8d916b99aef9a4b1e376df2dac0
Merge branch 'ds/doc-two-kinds-of-tags'

* ds/doc-two-kinds-of-tags:
  docs/git-tag: explain lightweight versus annotated tags
Documentation/git-tag.txt