Jonathan Nieder f07df52489 merge script: --ff-only to disallow true merge
Port v1.6.6-rc0~62^2 (Teach 'git merge' and 'git pull' the option
--ff-only, 2009-10-29) to the old merge script.

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.