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

merge.ff with and squash merge

From
RDRobert Dailey <rcdailey.lists@gmail.com>
Date
Oct 18, 2019, 14:47 UTC
Message-ID
<CAHd499BWRQxBBNpiP1LaudKFZ8+cot=QW6W52tB6bNPxznyOPw@mail.gmail.com>
If I do this:
$ git config merge.ff false
And then:
$ git merge --squash topic
I get:
> fatal: You cannot combine --squash with --no-ff.
I can work around this by executing:
$ git merge --squash --ff topic

Which essentially negates the `merge.ff` configuration. In this scenario, wouldn't it make sense for `--squash` to always imply `--ff`? I mean, I think the configuration is there to help me in the general case, but when I state I want a squash merge I'm pretty explicitly asking for a commit and not a fast forward.

Thoughts?
Message 1 of 1 in “merge.ff with and squash merge”
  1. Robert DaileyOct 18, 2019

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.