You're right that doesn't fix it and it is annoying. I just learned something about git, thanks! Thinking on this more I think I'd prefer changing `git checkou

You're right that doesn't fix it and it is annoying. I just learned something about git, thanks! Thinking on this more I think I'd prefer changing `git checkout/switch <branch>` to automatically use `origin/<branch>` instead (like mook mentions in a sibling comment), rather than changing the `git pull` behavior. Keeping the local branch refs in place after `git pull` lets you still easily see the local vs remote differences when running `git log`. Changing the behavior of `git checkout` or whatever you use to switch branches to auto fast-forward seems to be a way to have your cake and eat it too, almost. But, clearly you've thought more on this than I have (having just learned about it lol), what do you think?