Even just rebase fixup a commit that is a few commits below HEAD is just a few chords away. Use it many times a week when working.