| commit | aec7e9cd8cec16e64429379fa80ed5677f99e808 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Mar 2008 05:17:09 +0000 (23 22:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Apr 2008 05:31:02 +0000 (21 22:31 -0700) | ||
| tree | 5a74042654bfab7479580ae1bc185a73ff6cf14c | treesnapshot (tar.gz zip) |
| parent | 367bcc9cbc3d903c076fb1fe7d8643122cceffa1 | commitdiff |
Don't append default merge message to -m message
Traditionally "git merge -m 'message'" did not replace the default merge
message with the given message, but only prepended the given message,
keeping the default merge summary. This is something the caller can do
if it wants to.
Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Traditionally "git merge -m 'message'" did not replace the default merge
message with the given message, but only prepended the given message,
keeping the default merge summary. This is something the caller can do
if it wants to.
Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-merge.sh | diffblobblamehistory |