Create fixup commits for topic branches
Make your diffs human readable instead of machine readable
Open-source & free, battle-tested at Alibaba's scale
A PHP code-quality tool
Side-by-side diff viewer, editor and merge preparer
Distributed code review system for Git repos
Mergetool specifically for single git conflict files