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

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

From
SGSean Gies <sean.gies@imgtec.com>
Date
Feb 22, 2012, 21:51 UTC
Message-ID
<DB0837FD-0963-4BF9-BD7B-B243F580CC1C@imgtec.com>
Git developers, I have a small bug report:
When I specify the "--ff" option to git-merge, I expect it to perform a fast-forward merge or none at all. If the branches have diverged and a fast-forward cannot be done, I expect the command to fail. With git 1.7.6, if "git-merge -ff" cannot fast-forward, it falls back to creating the merge commit I did not want.

Thank you, -Sean

Next: Junio C Hamano
Message 1 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.