From: Junio C Hamano Date: Tue, 22 Apr 2008 07:48:50 GMT Subject: Re: [PATCH] Fast forward strategies allow, never, and only Message-ID: <7vhcdu2uu5.fsf@gitster.siamese.dyndns.org> In-Reply-To: <402c10cd0804191806h5460eb82y2442517343734b8e@mail.gmail.com> "Sverre Hvammen Johansen" writes: > On Sun, Mar 30, 2008 at 9:19 PM, Sverre Hvammen Johansen > 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. Sorry, but I am with a rather big backlog and am reluctant to go back the archive a looong way to pick up and comment on a series when not many people are wondering what happened to the wonderful series ;-) Care to resend and ask for comments from people?