One tool that I don't think gets enough love is the "git-fixup" add-on. It looks at your commit log and recommends relevant commits to fix-up based on your staged files.

If you are using fixup commits in your PR review process it's essential.