From: Yin Ping <pkufranky@gmail.com>
Date: Mon, 29 Oct 2007 13:05:56 GMT
Subject: Re: [BUG?] git-pull and git-merge don't support option --ff as the document says
Message-ID: <46dff0320710290605r187ac5dq930b72ffade9e406@mail.gmail.com>
In-Reply-To: <8c5c35580710290014o5750214te5b20eaf6127de9c@mail.gmail.com>

On 10/29/07, Lars Hjemli <hjemli@gmail.com> wrote:
> On 10/28/07, Yin Ping <pkufranky@gmail.com> 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).

see, 3x


-- 
franky