Git revert changes

git reset <filename> to unstage the file

Once unstaged,
git checkout -- <filename> to get rid of the changes and go back to normal