Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'yd/doc-merge-annotated-tag'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 28 Mar 2013 21:38:17 +0000
(14:38 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
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
raw
|
combined
(merge:
436b60c
77c7278
)
diff --cc
Documentation/git-merge.txt
Simple merge