We do this as well (using fixup! commits to make code changes and squash! commits to update the commit message).