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

Re: octopus merge --no-ff claims to fast-forward even though it doesn't

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 27, 2017, 21:59 UTC
Message-ID
<xmqqmvecxiz5.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CAJZjrdWdRGZ5DC1XV_YiNt-1sKiNgAtiS-eS9L6H2GJ+_8n08w@mail.gmail.com>
Samuel Lijin <sxlijin@gmail.com> writes:
> I was doing an octopus merge earlier and noticed that it claims to
> fast-forward when you specify --no-ff, even though it does actually
> abide by --no-ff.

This was intentional and hasn't changed since it was first designed; the octopus was to be used only for the simple and obvious merges.

If anything, I think it should error out when the --no-ff option is given, issuing the same error message as the one given when any step other than the last one needs manual resolution.

Previous: Samuel Lijin
Message 2 of 2 in “octopus merge --no-ff claims to fast-forward even though it doesn't”
  1. Samuel LijinJan 27, 2017
  2. Junio C HamanoJan 27, 2017

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.