Commit as often as you need or want and push into development branches. They are your checkpoints if you mess up, you experiment with things or you finish working on it for the moment. Just write commit messages that are useful for you to help you find your way back. Once the feature is done rebase everything into a single properly written commit and merge it with your main or feature branch.

In my experience that's as good as you can get it to work for you without stressing about commits at all really.