Merge branch 'yd/doc-merge-annotated-tag' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:37 +0000 (09:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:37 +0000 (09:19 -0700)
commitab24e7521c1027f7d86722345422ec92a5dde659
tree437837a113b09eac048e2d0d680e4cfd5a75ad03
parentfec274b01f39262f945edb64c14c3bfe130b5bef
parent77c72780edfa5e3858423366fc91699724793b39
Merge branch 'yd/doc-merge-annotated-tag' into maint

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