Git: Discard all changes on a diverged local branch

Question

I have a local topic branch that\'s tracking a remote branch. For the sake of argument, say the commit histories look like this:

A--B--C--O1--O2--O3 (origin/phob         


        

Answer 1

Delete the branch, then re-create it:

$ git branch -D phobos
$ git checkout --track -b phobos origin/phobos

Answer 2

git checkout phobos
git reset --hard origin/phobos

This tells Git to reset the head of phobos to the same commit as origin/phobos, and to update the working tree to match.