On Sun, Mar 30, 2008 at 9:19 PM, Sverre Hvammen Johansen <hvammen@xxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
