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

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

On 10/28/07, Yin Ping [off-list ref] 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

On 10/29/07, Lars Hjemli [off-list ref] wrote:

On 10/28/07, Yin Ping [off-list ref] wrote:

quoted

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