Instead of `rebase = true`, set `ff = only`. This makes it so *only* fast-forward pulls are allowed when issuing `git pull`. If a merge or rebase is required to pull down changes, it has to be an active choice.