Git Add -p
josh.blog
josh.blog
(1) you get to review changes as you stage them, which is good to confirm that all the changes still make sense.
(2) if you have _some_ changes that you want to commit, but not others, this avoids screwing up.
Honestly, I can't image using git without this.
Oh, and, please, don't use `git add .` and blindly stage+commit changes. It's honestly one of the worse common practices I've seen around.
His solution is to add complexity, effort (and opportunity for errors) to the process, rather than thinking, "maybe automatically reformatting the source code is something that should be done more selectively".