From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Apr 2013 16:19:37 +0000 (-0700)
Subject: Merge branch 'yd/doc-merge-annotated-tag' into maint
X-Git-Tag: v1.8.2.1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab24e7521c1027f7d86722345422ec92a5dde659;p=thirdparty%2Fgit.git

Merge branch 'yd/doc-merge-annotated-tag' into maint

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

ab24e7521c1027f7d86722345422ec92a5dde659