With a zippy cross-platform GUI toolkit, an unmatched syntax highlighting engine, and a custom high-performance Git reading library, Sublime Merge sets the bar for performance.

Features

Precise and Flexible

  • Commit exactly what you want with line-by-line and hunk staging. Select one or more lines to split hunks into multiple changes.

Sublime Highlighting

  • With the power of Sublime Text syntax highlighting, you can understand exactly what's been changed in a commit. With over 40 supported languages out of the box, and automatic loading of installed third-party syntaxes, we've got you covered.

Real Git

  • When you're using Sublime Merge, you're using Git. View the exact Git commands you're using, and seamlessly transition between the command line and Sublime Merge.

Powerful Search

  • Looking for a commit? Use find-as-you-type search to find the exact commit you're looking for.

Your Git Client

  • Make it yours with an adaptable layout and powerful theming system.

What's New:

New Features and Improvements

  • Added ability to edit staged files directly using the index editor
  • Text Diffs: Added diff_algorithm preference. By default, Sublime Merge will match the diff.algorithm Git preference.
  • Text Diffs: Carriage returns are always rendered unless newline normalization is enabled
  • Image Diffs: Added WebP support
  • Search: Added is-visible keyword
  • Search: Improved performance for contents queries
  • Search: Added support for branch queries as a subqueries
  • Repository Tabs: Added support for setting tab aliases via the tab context menu
  • LFS: Added ability to track files via the Files list context menu
  • LFS: Added icon to files tracked with LFS
  • Day/month/year ordering is now extracted from the user locale
  • Added support for loading Git objects on demand (partial clone support)
  • Added Change Theme to command palette
  • Added keybinding to navigate to the second parent of a commit (Alt+Shift+Down)
  • Added support for the context key in mousemaps
  • The parents row on commits with no parents is now hidden
  • Improved repository scanning performance
  • Various syntax highlighting improvements

Fixes

  • Fixed files list selections sometimes resetting when filtering
  • Fixed commit message ordering when squashing commits
  • Fixed Sublime Merge crashing with non-required Git filters
  • Fixed line count indicator showing for non-loaded diffs
  • Fixed word-based commands being enabled for password fields
  • Fixed the commit message editing command not providing Git output
  • Fixed scroll position being reset after deleting a branch
  • Fixed commit editing not showing the command output
  • Fixed git commondir handling
  • Fixed repository scanning crash with lock files
  • Windows: Fixed argument quoting for MSYS2 Git
  • Windows: Fixed Git clone failing on Windows when clone directory didn't exist
  • Windows: Fixed tooltips sometimes not being removed
  • Windows: Fixed OpenGL related crash
  • Windows, Linux: Assigned Ctrl + F4 keybinding to close tab
  • Linux: User config and cache paths are now created at startup if not present
  • Linux: Fixed crash when switching windows with a context menu open
  • Linux, Mac: Attempt to find the license key for the user when using sudo
  • Mac: Better support for running as root
  • Mac: Fixed unresponsiveness on certain signed commits
  • Mac: Fixed various memory errors

Note: Sublime Merge may be downloaded and evaluated for free, however a license must be purchased for continued use.