git.ipfire.org Git - thirdparty/git.git/commit - t/t7604-merge-custom-message.sh

]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7604-merge-custom-message.sh

projects / thirdparty / git.git / commit

author	Tay Ray Chuan <rctay89@gmail.com>
	Mon, 10 May 2010 17:17:52 +0000 (01:17 +0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 10 May 2010 19:02:20 +0000 (12:02 -0700)
commit	f0ecac2b70bf6b44b89dfa493abd2f544010b1eb
tree	2fd6c98705ae583f32b25d9ee36567e5a2554b65	tree \| snapshot
parent	8c6bdfdf8ba9a3d7a03d64b7a98305a460921130	commit \| diff

merge: --log appends shortlog to message if specified

When the user specifies a message, use fmt_merge_msg_shortlog() to
append the shortlog.

Previously, when a message was specified, we ignored the merge title
("Merge <foo> into <bar>") and shortlog from fmt_merge_msg().

Update the documentation for -m to reflect this too.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-merge.txt		diff \| blob \| blame \| history
builtin/fmt-merge-msg.c		diff \| blob \| blame \| history
builtin/merge.c		diff \| blob \| blame \| history
t/t7604-merge-custom-message.sh		diff \| blob \| blame \| history

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

RSS Atom