git.ipfire.org Git - thirdparty/git.git/commit

]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/merge.c

projects / thirdparty / git.git / commit

author	Junio C Hamano <gitster@pobox.com>
	Sat, 5 Nov 2011 04:31:28 +0000 (21:31 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 7 Nov 2011 22:06:39 +0000 (14:06 -0800)
commit	57b58db74c3272ac13d5d201ecedf6483b34cdfe
tree	b530170fcf23a0ebd9a02e01ffb63c41d0a6b3fe	tree \| snapshot
parent	7a2b128d13d880635e7317a9208cfa42a660f143	commit \| 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 \| blame \| history
t/t4202-log.sh		diff \| blob \| blame \| history
t/t7600-merge.sh		diff \| blob \| blame \| history
t/t7604-merge-custom-message.sh		diff \| blob \| blame \| history
t/t7608-merge-messages.sh		diff \| blob \| blame \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom