Tay Ray Chuan f0ecac2b70 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>

2010-05-10 12:02:20 -07:00

10 KiB

Raw Blame History

View Raw