# merge.ff with and squash merge

1 messages from 2019-10-18 to 2019-10-18. Participants: Robert Dailey.
Thread: https://gitlist.dev/t/52068

## Robert Dailey, 2019-10-18 14:47

Subject: merge.ff with and squash merge
Message-ID: <CAHd499BWRQxBBNpiP1LaudKFZ8+cot=QW6W52tB6bNPxznyOPw@mail.gmail.com>
URL: https://gitlist.dev/e/CAHd499BWRQxBBNpiP1LaudKFZ8%2Bcot%3DQW6W52tB6bNPxznyOPw%40mail.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?

```