I've had this same problem for a time, but then I realized that forcing myself to commit a lot of times and keep commits meaningful (commits must have a message, and so the committed changes must all be related to that message) also forced me to work in a more focused way: one feature/fix at a time. That is very very good.