I always do `git add -p` and `git commit -e -v` so that I know exactly what's in the commit