threads / bug / 10502

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

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

## tl;dr

3 messages between Oct 28, 2007 and Oct 29, 2007.

replies: 2people: 2as markdown or json

Yin Ping· Oct 28, 2007, 16:36 UTC · lore

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· Oct 29, 2007, 07:14 UTC · re: Yin Ping · lore

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

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· Oct 29, 2007, 13:05 UTC · re: Lars Hjemli · lore

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

On 10/29/07, Lars Hjemli <hjemli@gmail.com> wrote:

Show 6 quoted lines

> 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