Another option is git add -p, which asks you about each change so you can review them once more and maybe leave some (parts of) them for future commits.