How to revert Master branch to upstream

How do I change my upstream branch?

Set upstream branch using the git push command with the -u extension or use the longer version --set-upstream . Replace <branch name> with your branch name. The test branch now has a set upstream branch.

(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: