There's this handy git config 'pull.rebase' in case you miss it.

A lot of the merge commit was triggered when you pull and merge instead of rebasing locally.

https://git-scm.com/book/en/v2/Git-Branching-Rebasing