From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Mar 2013 21:38:17 +0000 (-0700)
Subject: Merge branch 'yd/doc-merge-annotated-tag'
X-Git-Tag: v1.8.3-rc0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1c8d8338f54c5aec18f4d0efa37cec30aafe12a;p=thirdparty%2Fgit.git

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

Document the 1.7.9 feature to merge a signed tag and keep that in
the mergetag header in the resulting commit better.

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

f1c8d8338f54c5aec18f4d0efa37cec30aafe12a