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

Re: Bug report: "git-merge --ff" should fail if branches have diverged

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 22, 2012, 22:14 UTC
Message-ID
<7vr4xm8qin.fsf@alter.siamese.dyndns.org>
In-Reply-To
<DB0837FD-0963-4BF9-BD7B-B243F580CC1C@imgtec.com>
Sean Gies <Sean.Gies@imgtec.com> writes:
> When I specify the "--ff" option to git-merge, I expect it to perform a
> fast-forward merge or none at all.
That expectation needs to be adjusted with s/--ff/--ff-only/, I think.

The "--no-ff" option says "Never do fast-forward and always create extra commit even when the side branch is a descendant", and the "--ff" option is a way to countermand it, i.e. "It is ok to fast-forward this merge".

And there is another one "I do not want anything bug fast forward", and that is spelled --ff-only.

Previous: Sean GiesNext: Junio C Hamano
Message 2 of 3 in “Bug report: "git-merge --ff" should fail if branches have diverged”
  1. Sean GiesFeb 22, 2012
  2. Junio C HamanoFeb 22, 2012
  3. Documentation/merge-options.txt: group "ff" related options togetherJunio C Hamano, Feb 22, 2012

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.