git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 436b60c 77c7278)
Merge branch 'yd/doc-merge-annotated-tag'
authorJunio C Hamano <redacted>
Thu, 28 Mar 2013 21:38:17 +0000 (14:38 -0700)
committerJunio C Hamano <redacted>
Thu, 28 Mar 2013 21:38:17 +0000 (14:38 -0700)
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

1  2 
Documentation/git-merge.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-merge.txt
Simple merge
git clone https://git.99rst.org/PROJECT