Merge branch 'yd/doc-merge-annotated-tag'
commitf1c8d8338f54c5aec18f4d0efa37cec30aafe12a
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2013 21:38:17 +0000 (28 14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2013 21:38:17 +0000 (28 14:38 -0700)
tree3e5186091020934412d318b906d4f3eeafcfc75f
parent436b60ce7aac4cf8e496c57c9baae46094571b22
parent77c72780edfa5e3858423366fc91699724793b39
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
Documentation/git-merge.txt