Git

Unstage files for commit

$ git reset <files>

Undo changes to a file

$ git reset --hard <files>