Sublime Merge

Sublime Merge is a new generation, feature-packed, and flexible Git client. The app's main purpose is to help power users work faster and more efficiently with Git.

Even though it boasts a very user-friendly GUI, Sublime Merge has a lot going for it. Some of its most notable advantages include a very fast and precise highlighting engine, as well as a custom, performance-oriented Git reading library.

It has well over 40 supported languages, and it even boasts an automatic loading system for third-party syntaxes. With its help, you can commit faster by staging files, hunks, and lines almost instantly.

Reviewing changes between commits is also a breeze. Of course, its syntax highlighting engine helps a lot, but this is also possible thanks to nifty features such as a side by side difference and character diff.

Another great aspect of Sublime merge is, of course, its powerful find-as-you-type search function. You can search over the whole repository, and perform complex searches by commit message, author, path, and various other contents.

Other noteworthy highlights include the selection of merge tools that allow you to resolve merge conflicts in mere seconds, a command palette, a submodule manager, command line integration, as well as Git Flow integration.

As expected from an app of this sort, Sublime Merge is very well equipped in the customization department. You have full control over the app's general behavior, as well as layout, commit messages, and the useful diff tools.

For example, you can choose between two looks for the GUI (dark and light), change the font face, size, and tab size, as well as tweak aspects regarding tab translation and merge commit display options. You can change the sidebar layout, the commit creation message position, the text diff style, the word wrap settings, as well as the whitespace visibility, and many many other things.

Sublime Merge doesn't fall short in any meaningful aspect. It's a well-designed app that has looks and feels like a modern Git GUI should. It boasts some of the best highlighting and diff engines out there, making merging commits and resolving conflicts feel like a walk in the park.