{"thread":{"id":"10502","subject":"[BUG?] git-pull and git-merge don't support option --ff as the document says","startedAt":"2007-10-28T16:36:58Z","lastAt":"2007-10-29T13:05:56Z","messageCount":3,"participants":["Yin Ping","Lars Hjemli"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"57435","messageId":"46dff0320710280936g4b1022fcpab02e72b99afa0f@mail.gmail.com","threadId":"10502","inReplyTo":null,"subject":"[BUG?] git-pull and git-merge don't support option --ff as the document says","fromName":"Yin Ping","fromEmail":"pkufranky@gmail.com","sentAt":"2007-10-28T16:36:58Z","receivedAt":"2007-10-28T16:36:58Z","isPatch":false,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"Released git version 1.5.3.4\n\nyinping@kooxoo235:~/git$ git-pull --ff\nUsage: /usr/local/bin/git-fetch <fetch-options> <repository> <refspec>...\nyinping@kooxoo235:~/git$ git-pull --no-ff\nUsage: /usr/local/bin/git-fetch <fetch-options> <repository> <refspec>...\n\n\nyinping@kooxoo235:~/git$ git-merge --ff origin/master\nUsage: /usr/local/bin/git-merge [-n] [--summary] [--no-commit]\n[--squash] [-s <strategy>] [-m=<merge-message>] <commit>+\nyinping@kooxoo235:~/git$ git-merge --no-ff origin/master\nUsage: /usr/local/bin/git-merge [-n] [--summary] [--no-commit]\n[--squash] [-s <strategy>] [-m=<merge-message>] <commit>+\n\n-- \nfranky\n"},{"id":"57471","messageId":"8c5c35580710290014o5750214te5b20eaf6127de9c@mail.gmail.com","threadId":"10502","inReplyTo":"46dff0320710280936g4b1022fcpab02e72b99afa0f@mail.gmail.com","subject":"Re: [BUG?] git-pull and git-merge don't support option --ff as the document says","fromName":"Lars Hjemli","fromEmail":"hjemli@gmail.com","sentAt":"2007-10-29T07:14:54Z","receivedAt":"2007-10-29T07:14:54Z","isPatch":false,"sender":{"key":"hjemli@gmail.com","avatar":null},"body":"On 10/28/07, Yin Ping <pkufranky@gmail.com> wrote:\n> Released git version 1.5.3.4\n\n--ff/--no-ff is not part of any released git version; you'll need to\nbuild the 'master' branch of git.git. And they're currently only\nsupported by git-merge, not git-pull (the same goes for --no-squash).\n\n-- \nlarsh\n"},{"id":"57479","messageId":"46dff0320710290605r187ac5dq930b72ffade9e406@mail.gmail.com","threadId":"10502","inReplyTo":"8c5c35580710290014o5750214te5b20eaf6127de9c@mail.gmail.com","subject":"Re: [BUG?] git-pull and git-merge don't support option --ff as the document says","fromName":"Yin Ping","fromEmail":"pkufranky@gmail.com","sentAt":"2007-10-29T13:05:56Z","receivedAt":"2007-10-29T13:05:56Z","isPatch":false,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"On 10/29/07, Lars Hjemli <hjemli@gmail.com> wrote:\n> On 10/28/07, Yin Ping <pkufranky@gmail.com> wrote:\n> > Released git version 1.5.3.4\n>\n> --ff/--no-ff is not part of any released git version; you'll need to\n> build the 'master' branch of git.git. And they're currently only\n> supported by git-merge, not git-pull (the same goes for --no-squash).\n\nsee, 3x\n\n\n-- \nfranky\n"}]}