{"thread":{"id":"52068","subject":"merge.ff with and squash merge","startedAt":"2019-10-18T14:47:21Z","lastAt":"2019-10-18T14:47:21Z","messageCount":1,"participants":["Robert Dailey"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"384383","messageId":"CAHd499BWRQxBBNpiP1LaudKFZ8+cot=QW6W52tB6bNPxznyOPw@mail.gmail.com","threadId":"52068","inReplyTo":null,"subject":"merge.ff with and squash merge","fromName":"Robert Dailey","fromEmail":"rcdailey.lists@gmail.com","sentAt":"2019-10-18T14:47:06Z","receivedAt":"2019-10-18T14:47:21Z","isPatch":false,"sender":{"key":"rcdailey.lists@gmail.com","avatar":null},"body":"If I do this:\n\n$ git config merge.ff false\n\nAnd then:\n\n$ git merge --squash topic\n\nI get:\n\n> fatal: You cannot combine --squash with --no-ff.\n\nI can work around this by executing:\n\n$ git merge --squash --ff topic\n\nWhich essentially negates the `merge.ff` configuration. In this\nscenario, wouldn't it make sense for `--squash` to always imply\n`--ff`? I mean, I think the configuration is there to help me in the\ngeneral case, but when I state I want a squash merge I'm pretty\nexplicitly asking for a commit and not a fast forward.\n\nThoughts?\n"}]}