git: Your branch and 'origin/master' have diverged - how to throw away local commits?

git fetch origin
git reset --hard origin/master

To preserve your old commits on a temporary branch in case you need them:

git branch temp

Then switch to the new master

git fetch origin
git reset --hard origin/master

Try doing this to blow away your local commits:

git reset --hard HEAD~4