From: Sverre Hvammen Johansen <hvammen@gmail.com>
Date: Sun, 20 Apr 2008 01:06:00 GMT
Subject: [PATCH] Fast forward strategies allow, never, and only
Message-ID: <402c10cd0804191806h5460eb82y2442517343734b8e@mail.gmail.com>
In-Reply-To: <402c10cd0803302119r251b3a43te69ce2a52e121ba5@mail.gmail.com>

On Sun, Mar 30, 2008 at 9:19 PM, Sverre Hvammen Johansen
<hvammen@gmail.com> wrote:
> I have attached a new set of patches to this email (to avoid
>
> line-wrapping issues if someone needs them for testing).  They are
>  also posted inlined for comments.
>
>  The patch series consists of the following five patches:
>
>    0001-New-merge-tests.patch
>    0002-Introduce-ff-fast-forward-option.patch
>    0003-Restructure-git-merge.sh.patch
>    0004-Head-reduction-before-selecting-merge-strategy.patch
>    0005-Introduce-fast-forward-option-only.patch

I consider myself finished with this and as far as I am concerned it
can be applied to git.git.  I am currently using this on top of 1.5.5
in production and assume it to be good.  All tests passes.

-- 
Sverre Hvammen Johansen