From: Yin Ping <pkufranky@gmail.com>
Date: Sun, 28 Oct 2007 16:36:58 GMT
Subject: [BUG?] git-pull and git-merge don't support option --ff as the document says
Message-ID: <46dff0320710280936g4b1022fcpab02e72b99afa0f@mail.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