You can make --rebase the default: git config --global pull.rebase true I have this set because it's never intentional when I do a pull to end up with an ugly

You can make --rebase the default: git config --global pull.rebase true I have this set because it's never intentional when I do a pull to end up with an ugly merge commit