From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 17 Aug 2010 07:11:03 +0000 (-0500)
Subject: merge script: handle --no-ff --no-commit correctly
X-Git-Tag: v1.7.3-rc0~16^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2a70fa4f1e377bc68bcabdc1a550e9970acccda7?ds=inline;hp=2a70fa4f1e377bc68bcabdc1a550e9970acccda7

merge script: handle --no-ff --no-commit correctly

In a --no-ff merge with conflicts, "git commit" used to forget the
--no-ff when used to complete the merge.  That was fixed by
v1.6.1-rc1~134^2 (builtin-commit: use reduce_heads() only when
appropriate, 2008-10-03) for the builtin merge.  Port the change to
the merge script in contrib/examples.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---