# [BUG?] git-pull and git-merge don't support option --ff as the document says

3 messages from 2007-10-28 to 2007-10-29. Participants: Yin Ping, Lars Hjemli.
Thread: https://gitlist.dev/t/10502

## Yin Ping, 2007-10-28 16:36

Subject: [BUG?] git-pull and git-merge don't support option --ff as the document says
Message-ID: <46dff0320710280936g4b1022fcpab02e72b99afa0f@mail.gmail.com>
URL: https://gitlist.dev/e/46dff0320710280936g4b1022fcpab02e72b99afa0f%40mail.gmail.com

```
Released git version 1.5.3.4

yinping@kooxoo235:~/git$ git-pull --ff
Usage: /usr/local/bin/git-fetch <fetch-options> <repository> <refspec>...
yinping@kooxoo235:~/git$ git-pull --no-ff
Usage: /usr/local/bin/git-fetch <fetch-options> <repository> <refspec>...


yinping@kooxoo235:~/git$ git-merge --ff origin/master
Usage: /usr/local/bin/git-merge [-n] [--summary] [--no-commit]
[--squash] [-s <strategy>] [-m=<merge-message>] <commit>+
yinping@kooxoo235:~/git$ git-merge --no-ff origin/master
Usage: /usr/local/bin/git-merge [-n] [--summary] [--no-commit]
[--squash] [-s <strategy>] [-m=<merge-message>] <commit>+

-- 
franky

```

## Lars Hjemli, 2007-10-29 07:14

Subject: Re: [BUG?] git-pull and git-merge don't support option --ff as the document says
Message-ID: <8c5c35580710290014o5750214te5b20eaf6127de9c@mail.gmail.com>
URL: https://gitlist.dev/e/8c5c35580710290014o5750214te5b20eaf6127de9c%40mail.gmail.com
In-Reply-To: <46dff0320710280936g4b1022fcpab02e72b99afa0f@mail.gmail.com>

```
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).

-- 
larsh

```

## Yin Ping, 2007-10-29 13:05

Subject: Re: [BUG?] git-pull and git-merge don't support option --ff as the document says
Message-ID: <46dff0320710290605r187ac5dq930b72ffade9e406@mail.gmail.com>
URL: https://gitlist.dev/e/46dff0320710290605r187ac5dq930b72ffade9e406%40mail.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

```