Two lines of git config, both of them the sort of thing you set once and never look at again:

git config pull.rebase true

git config rebase.autoStash true

Enter fullscreen mode

Exit fullscreen mode