Sublime Merge
Sublime Merge Sublime Merge Sublime Merge

Sublime Merge is a new Git client, from the makers of Sublime Text.

Sublime Merge is a sophisticated, cross-platform Git client designed for speed and precision, aiming to handle Git operations "the Sublime Text way".

Here is a summary of its principal functionalities:

Performance and Speed

Sublime Merge sets the bar for performance due to a zippy cross-platform GUI toolkit and a custom high-performance Git reading library. The client is described as being "really, really fast", allowing users to stage Files, Hunks, and Lines with no waiting.

Staging and Committing

The tool offers precise and flexible staging. Key features include:

  • Line-by-line Staging.

  • Hunk staging.

  • The ability to select one or more lines to split hunks into multiple changes.

  • Commit Editing.

Reviewing and Diffs

Sublime Merge provides robust tools for code review:

  • Side by Side Diffs.

  • Character Diffs.

  • Unmatched Syntax Highlighting powered by the Sublime Text engine. This helps users understand exactly what has changed in a commit. The tool supports over 40 languages out of the box.

  • Users can interactively show more context lines by dragging the top or bottom of a hunk.

Search Capabilities

The client features a powerful search system that offers instant search over the whole repository. This includes find-as-you-type search. Searches can be executed by commit message, author, path, and contents.

Conflict Resolution and Git Integration

  • A built-in merge tool allows for quick, painless resolution of merge conflicts.

  • The platform is built around "Real Git", allowing users to view the exact Git commands they are using.

  • It supports a seamless transition between the command line and Sublime Merge.

  • Integration includes Git Flow Integration and Command Line Integration.

Additional Features

The tool also includes features such as:

  • Command Palette

  • Blame and File History

  • Submodule Management

  • An adaptable layout and powerful theming system.