From: Lars Hjemli Date: Mon, 29 Oct 2007 07:14:54 GMT Subject: Re: [BUG?] git-pull and git-merge don't support option --ff as the document says Message-ID: <8c5c35580710290014o5750214te5b20eaf6127de9c@mail.gmail.com> In-Reply-To: <46dff0320710280936g4b1022fcpab02e72b99afa0f@mail.gmail.com> On 10/28/07, Yin Ping wrote: > Released git version 1.5.3.4 --ff/--no-ff is not part of any released git version; you'll need to build the 'master' branch of git.git. And they're currently only supported by git-merge, not git-pull (the same goes for --no-squash). -- larsh