[maltelau]

Would

  git commit --fixup <sha>

and

  git rebase -i --autosquash <previous-sha>

do what you need? Random blog link explaining it: [1]

[1] https://fle.github.io/git-tip-keep-your-branch-clean-with-fi...