From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Apr 2013 15:36:52 +0000 (-0700)
Subject: Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1
X-Git-Tag: v1.8.1.6~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0311e373b5f26f89ec65f0fbcebeba4fd68f4ad0;p=git

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
---

0311e373b5f26f89ec65f0fbcebeba4fd68f4ad0