Reset
satya - 4/20/2018, 2:58:10 PM
Looks you can do the following with reset
undo add index
undo commit
Undo a merge/pull
satya - 4/20/2018, 2:58:56 PM
Hard Reset
drop all your local changes and commits, fetch the latest history from the server and point your local master branch at it like this
git fetch origin
git reset --hard origin/master