git config pull.rebase false

Configure git to not rebase by default when doing a pull. Instead of rebasing, it will merge the changes.

You can add the --global flag to apply this setting to all your repositories:

git config --global pull.rebase false

If you want to override this setting for an individual pull use:

git pull --rebase