$ git fetch --all $ git reset --hard origin/master
$ git fetch downloads the latest from remote without trying to merge or rebase anything.
Then the $git reset resets the master branch to what you just fetched.
http://www.open-open.com/lib/view/open1434097780473.html