undo last commit:    git reset HEAD~
diff two branches:   git diff branch1 branch2 path/to/file