Instead of "git diff" followed by "git commit -a -m", I like to do: "git add -p" followed by commit.

You get to see the diff, piece by piece, and separate the independent fixes.