I agree Tomayko's method is very helpful, but I came to the conclusion it's better to just commit as often as possible.
- Multiple changes that affect the same line(s) are very difficult to pick apart.
- It is easier to write a meaningful commit message while the change is fresh in your head; otherwise a lot of time is spent reviewing your changes.