That's what `git revert`, `git checkout branch -- file` and `git reset` are for ;)