In regard to the first tip, I use `git add -i` even more often, because it gives you an interactive prompt that asks you which files you want to add to a commit (i.e. you don't have to type out the whole filename(s) each time).