You can can work on several things at once in your local repo and use "git commit --patch" to separate changes. Of course you never want unrelated changes (different "topics") in the same commit.

If a feature is better implemented after a certain refactoring, then you can do that at the same time locally but still separate it out into different commits.