This should be:

<pre>
git checkout master
git pull --ff-only origin master
git fetch
git reset --hard origin/master
</pre>