projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7a2b128) | patch
merge: notice local merging of tags and keep it unwrapped
authorJunio C Hamano <gitster@pobox.com>
Sat, 5 Nov 2011 04:31:28 +0000 (21:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Nov 2011 22:06:39 +0000 (14:06 -0800)
commit57b58db74c3272ac13d5d201ecedf6483b34cdfe
treeb530170fcf23a0ebd9a02e01ffb63c41d0a6b3fetree | snapshot
parent7a2b128d13d880635e7317a9208cfa42a660f143commit | diff
merge: notice local merging of tags and keep it unwrapped

This also updates the autogenerated merge title message from "merge commit X"
to "merge tag X", and its effect can be seen in the changes to the test suite.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c diff | blob | history
t/t4202-log.sh diff | blob | history
t/t7600-merge.sh diff | blob | history
t/t7604-merge-custom-message.sh diff | blob | history
t/t7608-merge-messages.sh diff | blob | history
Git—the stupid content tracker