Hacker News Reader

You don't have to remember that. Just call git config --global pull.rebase true And you are set to use just git pull always.

Except for the times I just want to have what's in upstream by resetting to that commit instead of merging or rebasing.

git fetch origin&& git reset --hard origin/$UPSTREAM