Branching

Create new branch and check out

git checkout -b <branch name>

Staging

discard changes

git checkout -- <file>