From: Sverre Hvammen Johansen Date: Tue, 18 Mar 2008 15:58:29 GMT Subject: Re: [RFC/PATCH Second draft] Fast forward strategies allow, never, and only Message-ID: <402c10cd0803180858v5d0e81bamfe86a1b4805eb631@mail.gmail.com> In-Reply-To: <20080318135704.GA11922@kooxoo235> On Tue, Mar 18, 2008 at 5:57 AM, Ping Yin wrote: > * Sverre Hvammen Johansen [2008-03-17 20:27:13 -0800]: > > > > New fast forward strategies, only, is introduced. This new fast > > forward strategy prevents real merges. > > > > > + fast_forward=allow ;; > > + *) > > + die "Available fast-forward strategies > > are: allow, newer, and only" ;; > > I fail to apply this patch. It seems wrapped here. Do you use "git send-email"? I cut and pasted it into gmail. I will resend the patch as an attachment together with a few other changes in about 14 hours. -- Sverre Hvammen Johansen