Then when you have the changes lined up you --amend that same commit.
You then add your changes and "git commit --amend".
(These could be aliases. Mine are "ci" and "ca" respectively.)