Git reset single file source: http://www.norbauer.com/rails-consulting/notes/git-revert-reset-a-single-file.html
git checkout filename