Overwriting remote and local

git push -f origin master
Then on other machine:
git fetch
git reset --hard origin/master