git - How to revert Master branch to upstream

Question

I have forked a git repository and setup upstream. I've made some changes in Master branch and committed and pushed to github.

Now what should I do to abandon all my changes in Master branch and make it identical to the upstream's master branch?

Answer 1

(I'm assuming that the changes that you now want to ignore are at your origin remote, you're on your master branch, and you want to revert to the contents of the upstream remote)

Firstly, reset your working copy to the upstream master:

git remote update
# the double hyphen ensures that upstream/master is
# considered as a revision and not confused as a path
git reset --hard upstream/master --

Then push this new branch-head to your origin repository, ignoring the fact that it won't be a fast-forward:

git push origin +master