[jgmarcel]

Exactly. That’s the default I use. You can set it via:

    git config --global pull.rebase merges