1
0
mirror of https://github.com/git/git.git synced 2025-03-31 22:49:05 +00:00
Jonathan Nieder eeb70b6769 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>
2010-08-18 14:02:05 -07:00
..
2008-02-27 12:53:26 -08:00
2007-11-18 19:11:42 -08:00
2008-05-25 13:41:37 -07:00
2007-11-05 12:25:42 -08:00
2007-11-28 17:06:57 -08:00
2010-02-13 19:36:13 -08:00
2007-09-23 17:13:55 -07:00

These are original scripted implementations, kept primarily for their
reference value to any aspiring plumbing users who want to learn how
pieces can be fit together.