Separating each non-breaking change into a different commit is a good way of making the history of changes (git log) easily understandable for yourself and for other people who may check out your code (e.g. reviewers, maintainers, etc). To do that, run:

git reset --soft HEAD~
git restore --staged .