Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1
commit0311e373b5f26f89ec65f0fbcebeba4fd68f4ad0
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:36:52 +0000 (3 08:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:36:52 +0000 (3 08:36 -0700)
tree24451326bd76faccb43505488f313ceb61359293
parent357d7f11ba0e2513c2f8bdcaff66aaf7e1f62a14
parent77c72780edfa5e3858423366fc91699724793b39
Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1

* yd/doc-merge-annotated-tag:
  Documentation: merging a tag is a special case