* [BUG?] git-pull and git-merge don't support option --ff as the document says
@ 2007-10-28 16:36 Yin Ping
2007-10-29 7:14 ` Lars Hjemli
0 siblings, 1 reply; 3+ messages in thread
From: Yin Ping @ 2007-10-28 16:36 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [BUG?] git-pull and git-merge don't support option --ff as the document says
2007-10-28 16:36 [BUG?] git-pull and git-merge don't support option --ff as the document says Yin Ping
@ 2007-10-29 7:14 ` Lars Hjemli
2007-10-29 13:05 ` Yin Ping
0 siblings, 1 reply; 3+ messages in thread
From: Lars Hjemli @ 2007-10-29 7:14 UTC (permalink / raw)
To: Yin Ping; +Cc: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [BUG?] git-pull and git-merge don't support option --ff as the document says
2007-10-29 7:14 ` Lars Hjemli
@ 2007-10-29 13:05 ` Yin Ping
0 siblings, 0 replies; 3+ messages in thread
From: Yin Ping @ 2007-10-29 13:05 UTC (permalink / raw)
To: Lars Hjemli; +Cc: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-10-29 13:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-28 16:36 [BUG?] git-pull and git-merge don't support option --ff as the document says Yin Ping
2007-10-29 7:14 ` Lars Hjemli
2007-10-29 13:05 ` Yin Ping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).