I have attached four patches to this email (to avoid line-wrapping
issues if someone needs them for testing).  They are also posted
inlined for comments.

On Sat, Mar 22, 2008 at 11:49 AM, Junio C Hamano <gitster@pobox.com> wrote:
quoted text
>  In a series of patches, restructuring without changing
>  semantics should come first to make existing logic cleaner and later
>  enhancements on top of it easier to follow.

The patch series consists of the following four patches:

   0001-Introduce-ff-fast-forward-option.patch
   0002-Restructuring-git-merge.sh.patch
   0003-Head-reduction-before-selecting-merge-strategy.patch
   0004-Introduce-fast-forward-option-only.patch

The first and the last one is trivial.  Head reduction is more
complicated.   I have split this one in two as you suggested except
that the one for restructuring does not come as the first on in this
series of patches.

-- 
Sverre Hvammen Johansen