git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Yin Ping <pkufranky@gmail.com>
Date
Oct 29, 2007, 13:05 UTC
Message-ID
<46dff0320710290605r187ac5dq930b72ffade9e406@mail.gmail.com>
In-Reply-To
<8c5c35580710290014o5750214te5b20eaf6127de9c@mail.gmail.com>
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
Previous: Lars Hjemli
Message 3 of 3 in “[BUG?] git-pull and git-merge don't support option --ff as the document says”
  1. Yin PingOct 28, 2007
  2. Lars HjemliOct 29, 2007
  3. Yin PingOct 29, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.