I would say the best thing is to cultivate the habit of thinking and working cleanly, so you create a history of small, logical, incremental commits.

But the second best thing is to think and work messily, and use rebasing to fake a history of small, logical, incremental commits!