projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f5d3a6f) | patch
merge script: handle -m --log correctly
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:06:56 +0000 (02:06 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:05 +0000 (14:02 -0700)
commiteeb70b6769ad484989c8708a85fef112726a35e1
treeef54dd4b5c0d57bc5683c07de2abba4a99fac816tree | snapshot
parentf5d3a6f575b12af88561ad5a3b1fc8f866f49056commit | diff
merge script: handle -m --log correctly

Based on v1.7.1.1~23^2 (merge: --log appends shortlog to message if
specified, 2010-05-11).  Without this change, the scripted
(non-builtin) merge does not pass t7604.

Cc: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/examples/git-merge.sh diff | blob | history
Git—the stupid content tracker