Sublime Merge

About

Sublime Merge is a Git client available for Mac, Windows, and Linux. It lets you stage files, hunks, and individual lines, and you can select one or more lines to split a hunk into multiple changes so you commit exactly what you want. The website also lists commit editing and says the app is fast when staging.

For code reviews, Sublime Merge offers side-by-side diffs, syntax highlighting, and character diffs, and you can drag the top or bottom of a hunk to show more context lines. Its search runs across your whole repository as you type, matching commit messages, authors, paths, and contents. A built-in merge tool is provided for resolving conflicts.

Sublime Merge uses real Git: you can view the exact Git commands it runs and move between the command line and the app. Its layout and theming can be adapted, and it uses the syntax highlighting engine from Sublime Text, with over 40 languages supported out of the box.