]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 436b60c 77c7278)
Merge branch 'yd/doc-merge-annotated-tag'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2013 21:38:17 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2013 21:38:17 +0000 (14:38 -0700)
commitf1c8d8338f54c5aec18f4d0efa37cec30aafe12a
tree3e5186091020934412d318b906d4f3eeafcfc75ftree | snapshot
parent436b60ce7aac4cf8e496c57c9baae46094571b22commit | diff
parent77c72780edfa5e3858423366fc91699724793b39commit | diff
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 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.