Revert "Make pull --rebase the default behavior"

This reverts commit 67a7549b56b6eacd92106e401f05f783fc52f262.