diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 07:06:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 21:02:05 (GMT) |
| commit | eeb70b6769ad484989c8708a85fef112726a35e1 (patch) | |
| tree | ef54dd4b5c0d57bc5683c07de2abba4a99fac816 /mailmap.c | |
| parent | f5d3a6f575b12af88561ad5a3b1fc8f866f49056 (diff) | |
| download | git-eeb70b6769ad484989c8708a85fef112726a35e1.zip git-eeb70b6769ad484989c8708a85fef112726a35e1.tar.gz git-eeb70b6769ad484989c8708a85fef112726a35e1.tar.bz2 | |
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>
Diffstat (limited to 'mailmap.c')
0 files changed, 0 insertions, 0 deletions