Softpedia >Windows >Programming >Other Programming Files >Sublime Merge >  Changelog

Sublime Merge Changelog

What's new in Sublime Merge Build 2095 Dev

Apr 19, 2024
  • Linux: Fixed issue with smooth scrolling

New in Sublime Merge Build 2095 Dev (Apr 19, 2024)

  • Linux: Fixed issue with smooth scrolling

New in Sublime Merge Build 2094 Dev (Apr 11, 2024)

  • Fixed crash when opening the merge tool

New in Sublime Merge Build 2093 Dev (Apr 10, 2024)

  • Diffs: Improved character diffing algorithm
  • Diffs: Improved selection readability
  • Blame: Fixed viewport tracking
  • Blame: Fixed incorrect icons displaying for newly created files
  • Repository Tabs: Fixed bug in restore order
  • Files List: Improved render performance with a large number of files
  • Fixed unstaging hunks failing when the file has been renamed
  • Fixed large tabs jumping when being dragged
  • Fixed bug in commit message clean up
  • Fixed bug in multi-file context menu
  • Improved stash drop message
  • Improved stability by fixing numerous crashes

New in Sublime Merge Build 2092 (Oct 26, 2023)

  • Added syntax-based code folding
  • Various syntax highlighting improvements
  • Newly rewritten Haskell syntax highlighting thanks to deathaxe
  • The recent file list is now global instead of per window
  • Files opened in Sublime Text are now added to the system recent file list (See the "update_system_recent_files" setting)
  • Added commands for converting between common identifier cases (See Edit > Convert Case)
  • Added "hot_exit_projects" setting to control what data gets saved in workspace files
  • Added "minimap_horizontal_scrolling" setting
  • Added "open_tabs_after_current" setting for controlling where tabs are opened
  • Added "show_spelling_errors" and "show_line_column" settings
  • Added "goto_anything_exclude_gitignore" setting
  • Added "ruler_style" setting
  • Reworked comment toggling to better handle embedded languages
  • Sub-word separators are now configurable using the "sub_word_separators" setting
  • Added support for Nordic (Windows 865) encoding
  • Reopening a file now asks for confirmation when there are unsaved changes
  • Improved filesystem symbolic link detection
  • Improved performance while open folders are scanned for the side-bar
  • Improved regex performance for syntax highlighting
  • Find: Patterns taken from an open file are now escaped for regex searches
  • Find in Files: Improved binary file detection for find-in-files
  • Find in Files: Find-in-files now supports project-relative patterns starting with //
  • Find in Files: Added the "find_in_files_max_file_size" setting
  • Syntax Highlighting: Context backtraces now link to their origin in sublime-syntax files
  • Syntax Highlighting: Fixed crash caused by starting a branch point at the end of a line
  • Syntax Highlighting: Fixed various syntax highlighting bugs related to backtracking
  • Rendering: Improved performance with large folded regions
  • Rendering: Fixed OpenGL issue related to the wrong context being active
  • Rendering: Fixed shadow related OpenGL rendering bug
  • Rendering: Fixed region rendering edge case
  • Rendering: Improved performance in files with large diffs
  • Rendering: Fixed various issues with faded labels in the sidebar
  • Rendering: Fixed text annotation underlines not drawing when combined with other font styles
  • Sort Lines no longer includes the newline at EOF when nothing is selected
  • Fixed very large unsaved files being lost on hot exit; a prompt is now shown to save them
  • Fixed extraneous window getting created at startup with hot exit disabled
  • Fixed case where multiple reload prompts could show simultaneously
  • Drag operations are no longer interrupted when reloading a file
  • Fixed case where text in command palette was incorrectly colored
  • Fixed side bar button theming issue in the Default theme
  • Fixed sometimes not being able to type a space after completing a snippet
  • Fixed wrong default extension being used in open file dialog
  • Fixed centered views jumping in some cases when whole content is replaced
  • Fixed scroll jumping when folding
  • Fixed Reveal in Side Bar not working in some cases
  • Fixed scroll bar sometimes showing when text is wrapped
  • Fixed sheets not being added to the current selection in some cases
  • Added missing theming attributes to update dialog
  • Linux: System scroll bar overlay settings are now followed
  • Linux: Fixed various issues caused by the C locale
  • Linux: Added safeguard around nested GTK main loops possibly causing data loss
  • Linux: Fixed case where dragging a tab to a window wasn't working
  • Linux: Fixed crash on startup for some desktop environments
  • Linux: Fixed not being able to grab the scrollbar in a maximized window when at the right edge of the screen
  • Windows: Adjusted for the new Windows 11 window border
  • Windows: Open Containing Folder and similar now respect file explorer replacements
  • Windows: Fixed GDI font glow glyph positioning
  • Mac: Fixed license being removed due to network MAC address changing
  • Mac: Fixed cursor getting stuck as a resize handle on Ventura
  • Mac: Recent files are now available without having a window open
  • Mac: Fixed various issues with the quick switch project dialog
  • Mac: Fixed issue where dialogs could be triggered during dialogs
  • Mac: Fixed case when opening an already open file would jump to the start
  • Mac: Added work around for broken modal loops
  • Mac: Fixed case where settings window couldn't be closed
  • Mac: Fixed open file dialog crash with some syntaxes
  • Mac: Fixed scrolling when command modifier key is pressed
  • Mac: Fixed Window/New Tab not working with the Adaptive theme
  • API: Added buffer variable to the console
  • API: A noop command can now be used for keybindings to block default behavior
  • API: "encoded_position": true may be passed to open_file command for the same behavior as sublime.ENCODED_POSITION
  • API: View.context_backtrace can be used to get a stack trace from syntax highlighting
  • API: View.expand_to_scope now returns None when the text point doesn't match the selector
  • API: Added View.expand_to_scope
  • API: Added Window.promote_sheet
  • API: Fixed crash when running hide_panel command from EventListener.on_deactivated
  • API: The toggle_comment command can now take a variant argument for languages with multiple comment variants

New in Sublime Merge Build 2091 (Sep 7, 2023)

  • 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 co

New in Sublime Merge Build 2090 Dev (Aug 21, 2023)

  • Fixed git commondir handling
  • Fixed repository scanning crash with lock files
  • Fixed commit graph loading regression
  • Windows: Fixed OpenGL related crash

New in Sublime Merge Build 2089 Dev (Aug 17, 2023)

  • Added a timeout to commit signature verification
  • Fixed an infinite loop regression

New in Sublime Merge Build 2088 Dev (Aug 16, 2023)

  • Updated blame to use author date rather than commit date
  • Fixed a crash regression when closing repository tabs
  • Fixed 24hr date formatting regression
  • Mac: Fixed bug in year/month/day formatting

New in Sublime Merge Build 2087 Dev (Aug 11, 2023)

  • Fixed a crash regression in 2086

New in Sublime Merge Build 2084 Dev (Mar 17, 2023)

  • 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
  • Image Diffs: Added WebP support
  • Added Change Theme to command palette
  • Fixed scroll position being reset after deleting a branch
  • Fixed commit editing not showing the command output
  • Mac: Better support for running as root
  • Linux, Mac: Attempt to find the license key for the user when using sudo

New in Sublime Merge Build 2083 (Feb 6, 2023)

  • New Features and Improvements:
  • Automatically fetch with the new auto_fetch preference
  • Files tab: Added support for multi-select
  • Locations tab: Branches with invalid tracking information are now faded
  • Added preference for ordering commit graph by author date
  • Search: Selects the current search query when opening search page
  • Custom commands now support selectors anywhere in an argument
  • Added expand_untracked_files_by_default preference
  • Added re-run button to failed commands in the command history
  • Fixes:
  • Windows and Mac: Updated bundled Git to 2.39.1 (addresses CVE-2022-41903 and CVE-2022-23521)
  • Mac and Linux: Fixed large Git LFS diffs failing to load
  • Mac: Fixed Sublime Merge crashing when child processes crash
  • Fixed git filters hanging on Windows
  • Fixed crash when creating tags on certain commits
  • Fixed incorrect count in branch "ahead" indicator tooltips
  • Fixed syntax highlighting performance issue due to backtracking
  • Fixed modified commit messages being discarded when continuing cherry-pick
  • Fixed memory leak when searching with certain terms
  • Fixed HEAD indictator not updating when initializing submodules
  • Fixed some Git commands failing on branches called stash
  • Fixed "Resolve" conflict buttons not handling file deletions

New in Sublime Merge Build 2082 Dev (Jan 31, 2023)

  • Fixed auto-fetch triggering when there are pending fetches
  • Disabled expand_untracked_files_by_default by default
  • Windows and Mac: Updated bundled Git to 2.39.1 (addresses CVE-2022-41903 and CVE-2022-23521)
  • Mac and Linux: Fixed large Git LFS diffs failing to load
  • Mac: Fixed Sublime Merge crashing when child processes crash

New in Sublime Merge Build 2081 Dev (Dec 13, 2022)

  • Added preference for ordering commit graph by author date
  • Fixed custom commands being disabled in certain scenarios
  • Fixed "Resolve" conflict buttons not handling file deletions
  • Fixed git filters hanging on Windows

New in Sublime Merge Build 2080 Dev (Dec 6, 2022)

  • Automatically fetch with the new auto_fetch preference
  • Files tab: Now with multi-select
  • Locations tab: Branches with invalid tracking information are now faded
  • Search: select current search query when opening search page
  • Custom commands now support selectors anywhere in an argument
  • Added expand_untracked_files_by_default preference
  • Added re-run button to failed commands in the command history
  • Fixed crash when creating tags on certain commits
  • Fixed incorrect count in branch "ahead" indicator tooltips
  • Fixed syntax highlighting performance issue due to backtracking
  • Fixed modified commit messages being discarded when continuing cherry-pick
  • Fixed memory leak when searching with certain terms
  • Fixed HEAD indictator not updating when initializing submodules
  • Fixed some Git commands failing on branches called stash

New in Sublime Merge Build 2079 (Nov 14, 2022)

  • Added Open Submodule to command palette
  • Added Copy Tag Name to tag context menu
  • Added support for GIT_CONFIG_SYSTEM and GIT_CONFIG_GLOBAL environment variables
  • Improved unsafe repository detection
  • Added license date to about window
  • Fixed hunk header expansion selecting text beneath header
  • Fixed bug that disabled commit message editing
  • Fixed commit message loss when stashing in certain situations
  • Fixed commit edits failing when submodule changes are detected
  • Fixed signature verification failing for ssh signatures
  • Fixed crash when opening context menu below table of contents
  • Mac: Fixed license being removed due to mac address changing
  • Mac: Miscellaneous Ventura fixes

New in Sublime Merge Build 2078 Dev (Nov 1, 2022)

  • Added Open Submodule to command palette
  • Added Copy Tag Name to tag context menu
  • Added support for GIT_CONFIG_SYSTEM and GIT_CONFIG_GLOBAL environment variables
  • Improved unsafe repository detection
  • Added license date to about window
  • Fixed hunk header expansion selecting text beneath header
  • Fixed bug that disabled commit message editing
  • Fixed commit message loss when stashing in certain situations
  • Fixed commit edits failing when submodule changes are detected
  • Fixed signature verification failing for ssh signatures
  • Fixed crash when opening context menu below table of contents
  • Mac: Fixed license being removed due to mac address changing
  • Mac: Miscellaneous Ventura fixes

New in Sublime Merge Build 2077 (Aug 23, 2022)

  • New Features and Improvements:
  • Patches: Easily create and apply patches using the commit and file context menus. Apply patches using the application menu or command palette.
  • Stash: Added support for --staged flag
  • Diffs: Added/Deleted files are now always displayed as inline diffs
  • Commit Graph: Added commit_graph_author_date preference
  • Added Create Branch from Remote Branch back to command palette
  • Added Open Containing Folder to the command palette
  • Fixes:
  • Fixed open_in_editor command waiting
  • Update dialog now displays license validity information
  • Updated pull/push keybindings to remove conflicts with OS keybindings
  • Fixed table of contents files missing cherry pick and revert menu items
  • Fixed signature verification and commit editing failing on repositories with detached working directories
  • Fixed edit_commit_contents failing on commits with no grandparents
  • Fixed navigate_to_tag failing to find tags
  • Command history layout state now persists
  • Fixed empty condensed branch annotations appearing
  • Fixed file mode changes disappearing when all hunks are staged
  • Fixed crash when staging certain files with file mode changes
  • Improved commit message syntax highlighting
  • Tweaked theming for headers in dark theme
  • Various performance fixes

New in Sublime Merge Build 2075 (Jul 26, 2022)

  • Patches: Easily create and apply patches using the commit and file context menus. Apply patches using the application menu or command palette.
  • Stash: Added support for --staged flag
  • Commit Graph: Added commit_graph_author_date preference
  • Added Open In Editor to context menu of hidden whitespace hunks
  • Added Open Containing Folder to the command palette
  • Update dialog now displays license validity information
  • Newly added files are now always displayed as inline diffs
  • Fixed table of contents files missing cherry pick and revert menu items
  • Fixed signature verification and commit editing failing on repositories with detached working directories
  • Fixed edit_commit_contents failing on commits with no grandparents
  • Fixed navigate_to_tag failing to find tags
  • Fixed command history layout state not persisting
  • Fixed open_in_editor command waiting
  • Fixed file mode changes disappearing when all hunks are staged
  • Fixed crash when staging certain files with file mode changes
  • Various performance fixes

New in Sublime Merge Build 2074 (Jun 10, 2022)

  • New Features and Improvements:
  • Application: Added dialog to mark unsafe repositories as safe
  • Tags: Added tags to checkout command
  • Search: file and path queries now support absolute paths and Windows-style paths
  • Files List: Added context menu for commit files
  • Revert: Added warning when checking out a branch when a revert is in progress
  • Various syntax highlighting improvements
  • Added ruler_style setting
  • Fixes:
  • Submodules: Fixed submodule diffs showing outdated hashes
  • Files List: Fixed discard filtered files ignoring the filter
  • Files List: Fixed files list filter applying to commit dialog context menus
  • Navigation: Fixed tab-navigation focusing on hidden dialogs
  • Filters: Fixed certain filters causing the application to hang
  • Commit Message: Removed extra padding in commit message input
  • Mac: Fixed bundled Git compatibility
  • Mac: Fixed context menu input focus bug

New in Sublime Merge Build 2073 Dev (Jun 6, 2022)

  • Search: file and path queries now support absolute paths and Windows-style paths
  • Commands: Fixed checkout_branch command failing when the branch is supplied without an explicit ref type
  • Various syntax highlighting improvements
  • Added "ruler_style" setting
  • Mac: Fixed context menu input focus bug

New in Sublime Merge Build 2072 Dev (May 10, 2022)

  • Application: Added dialog to mark unsafe repositories as safe
  • Tags: Added tags to checkout command
  • Revert: Added warning when checking out a branch when a revert is in progress
  • Submodules: Fixed submodule diffs showing outddated hashes
  • Files List: Added context menu for commit files
  • Files List: Fixed discard filtered files ignoring the filter
  • Files List: Fixed files list filter applying to commit dialog context menus
  • Navigation: Fixed tab-navigation focusing on hidden dialogs
  • Filters: Fixed certain filters causing the application to hang
  • Commit Message: Removed extra padding in commit message input
  • Mac: Fixed bundled Git compatibility

New in Sublime Merge Build 2071 Dev (Apr 25, 2022)

  • New Features and Improvements:
  • Files List: Stage filtered files using the file section context menus
  • Improved interface for staging/unstaging large changesets
  • Commit List: Added keyboard support for opening context menus
  • Branches: Combined all checkout commands into a single command
  • Branches: Added ability to unset upstreams
  • Search: Added auto-matching for quotes
  • Submodules: Added support for non-absorbed submodules
  • Create Tag: Added warning when tag name is invalid
  • Fixes:
  • Fixed scroll position being lost when dropping a commit
  • Fixed scroll tracking when staging large files
  • Fixed commit message container layout issues
  • Fixed hunk container layout issue for large hunks
  • Fixed OpenGL rendering issue related to the wrong context being active
  • Fixed shadow related OpenGL rendering bug
  • Fixed potential for corrupted menu items in commit message history
  • Fixed back button not working in file history
  • Syntax Highlighting: Fixed crash caused by starting a branch point at the end of a line
  • Windows and Mac: Updated bundled Git to 2.35.3 (addresses CVE-2022-24765 and CVE-2022-24767)
  • Mac: Fixed Ctrl+Mouse1 not opening commit graph context menus
  • Mac: Added work around for broken modal loops
  • Linux: Follow system scroll bar overlay setting
  • Linux: Fixed various issues caused by the C locale

New in Sublime Merge Build 2070 Dev (Apr 21, 2022)

  • Improved interface for staging/unstaging large changesets
  • Added ability to unset upstreams
  • Fixed scroll position being lost when dropping a commit
  • Fixed scroll tracking when staging large files
  • Windows and Mac: Updated bundled Git to 2.35.3 (addresses CVE-2022-24765 and CVE-2022-24767)
  • Mac: Fixed Ctrl+Mouse1 not opening commit graph context menus
  • Mac: Added work around for broken modal loops

New in Sublime Merge Build 2069 Dev (Mar 17, 2022)

  • Files List: Stage filtered files using the file section context menus
  • Checkout Branch: Combined all commands into a single command
  • Create Tag: Added warning when tag name is invalid
  • Submodules: Added support for non-absorbed submodules
  • Search: Added auto-matching for quotes
  • Commit List: Added keyboard support for opening context menus
  • Fixed commit message container layout issues
  • Fixed hunk container layout issue for large hunks
  • Fixed OpenGL rendering issue related to the wrong context being active
  • Fixed shadow related OpenGL rendering bug
  • Fixed potential for corrupted menu items in commit message history
  • Fixed back button not working in file history
  • Syntax Highlighting: Fixed crash caused by starting a branch point at the end of a line

New in Sublime Merge Build 2068 (Dec 21, 2021)

  • New Features and Improvements:
  • Search: Quickly write queries with auto-complete suggestions
  • Improved OpenGL rendering performance by automatically batching together controls
  • Fetch / Pull Command: Added ability to fetch tags
  • Merge Command: Merge unrelated histories using the allow-unrelated-histories flag
  • Set Upstream Command: Indicate the current upstream in the list of remote branches
  • Commit Details: Added context menus to commit metadata items
  • Commit Dialog: Stage submodule changes using Enter
  • Commit Messages: Added support for strip and default modes of commit.cleanup
  • Commit Messages: Warn when commit message only contains comments
  • Context Variables: Access the in-progress commit message via the commit_message variable
  • Settings: Highlight missing signatures and public keys as errors with signature_error_highlighting
  • Settings: Added draw_unicode_bidi setting, which is enabled by default
  • Recent Repositories: Added Clear missing menu item
  • Recent Repositories: Prompt to remove from list when opening non-existent repositories
  • Clone Page: Added tooltips to clone page inputs
  • Fixes:
  • Commit Editing: Fixed author information being updated
  • Fixed lines with whitespace preceding comment characters being treated as comments
  • Fixed light changelog displaying when dark theme is enabled
  • Fixed crash when selecting previous commit messages containing certain UTF-8 sequences
  • Fixed issue with rebase branch preview
  • Fixed data corruption potentially occurring if a crash happens while saving the session
  • Fixed crash when filtering table of contents
  • Windows: Fixed crash when OpenGL initialization fails
  • Mac and Windows: Fixed command line / terminal not taking focus after waiting
  • Mac: Fixed Window > Merge All Windows merging minimized windows
  • Mac: Fixed native tabs restoration resulting in odd behavior
  • Linux: Added missing libcurl dependency for package managers

New in Sublime Merge Build 2067 Dev (Dec 17, 2021)

  • Fixed stage_hunk keybinding regression for executable and symlinked files
  • Fixed author information being updated when editing commits

New in Sublime Merge Build 2066 Dev (Dec 16, 2021)

  • Added ability to fetch tags via the fetch and pull commands
  • Recent Repositories: Added Clear missing menu item
  • Search: Improved search auto-complete theming
  • Search: Fixed `toggle_search` keybinding regression
  • Improved OpenGL rendering performance by automatically batching together controls

New in Sublime Merge Build 2065 Dev (Dec 10, 2021)

  • Set Upstream: Indicate the current upstream in the list of remote branches
  • Fixed text phantom rendering regression
  • Linux: Fixed packaging issue

New in Sublime Merge Build 2064 Dev (Dec 7, 2021)

  • Search: Quickly write queries with auto-complete suggestions
  • Recent Repositories List: Prompt to remove from list when opening non-existent repositories
  • Merge Command: Merge unrelated histories using the allow-unrelated-histories flag
  • Commit Messages: Added support for strip and default modes of commit.cleanup
  • Commit Messages: Warn when commit message only contains comments
  • Commit Details: Added context menus to commit metadata items
  • Commit Dialog: Stage submodule changes using Enter
  • Context Variables: Access the in-progress commit message via the commit_message variable
  • Settings: Highlight missing signatures and public keys as errors with signature_error_highlighting
  • Settings: Added draw_unicode_bidi setting, which is enabled by default
  • Clone Page: Added tooltips to clone page inputs
  • Fixed lines with whitespace preceding comment characters being treated as comments
  • Fixed light changelog displaying when dark theme is enabled
  • Fixed crash when selecting previous commit messages containing certain non-ascii sequences
  • Fixed issue with rebase branch preview
  • Fixed data corruption potentially occurring if a crash happens while saving the session
  • Fixed crash when filtering table of contents
  • Windows: Fixed crash when OpenGL initialization fails
  • Mac and Windows: Fixed command line / terminal not taking focus after waiting
  • Mac: Fixed Window > Merge All Windows merging minimized windows
  • Mac: Fixed native tabs restoration resulting in odd behavior
  • Linux: Added missing libcurl dependency for package managers

New in Sublime Merge Build 2063 (Oct 26, 2021)

  • New Features and Improvements:
  • Search by branch using the branch: operator or via the branch context menus
  • Stage hunks and individual lines on untracked files
  • Navigate to commit references in commit messages using the context menu
  • Add comment and commit highlighting to commit messages
  • Added new update dialog that shows versions, license status and links to the changelog
  • Added indicators to repository tabs with uncommitted changes
  • Added context menus for uncommitted file tabs
  • Updated repository tabs to show the full repository path in a tooltip
  • Updated file tabs to show the relative path in a tooltip
  • Improved the authentication dialog for GitHub users
  • Improved hardware acceleration performance when rendering white space
  • Improved the update_remote_url command to populate with the current URL
  • Various syntax definition updates
  • Fixes:
  • Fixed gpg hanging on certain systems
  • Fixed the incorrect menu showing for staged files
  • Fixed diff selections not rendering correctly when line_padding is set
  • Windows: Fixed slow window creation when using OpenGL

New in Sublime Merge Build 2062 Dev (Oct 15, 2021)

  • Improved performance when multiple repository tabs are open
  • Fixed sequential key binding regression in 2061

New in Sublime Merge Build 2061 Dev (Oct 14, 2021)

  • Added line-by-line staging for untracked files
  • Added context menus for uncommitted file tabs
  • Added tooltips for file tabs
  • Fixed stale repository tab indicators on inactive tabs
  • Fixed gpg hanging on certain systems
  • Fixed diff selections not rendering correctly when line_padding is set
  • Various syntax definition updates

New in Sublime Merge Build 2060 Dev (Oct 7, 2021)

  • Search by branch using the branch: operator or via the branch context menus
  • Added new update dialog that shows versions, license status and links to the changelog
  • Added comment and commit syntax-highlighting to commit messages
  • Added indicators to repository tabs with uncommitted changes
  • Updated repository tabs to show full path in tooltip
  • Normalise newlines for commit templates
  • Improved the update_remote_url command to populate with the current URL
  • Improved the authentication dialog for GitHub users
  • Improved hardware acceleration performance when rendering white space
  • Fixed the incorrect menu showing for staged files
  • Windows: Fixed slow window creation when using OpenGL

New in Sublime Merge Build 2059 (Jul 23, 2021)

  • New Features and Improvements:
  • Cherry Pick multiple commits via the commit graph and context menu
  • Cherry Pick: added support for the-x flag
  • Revert multiple commits via the commit graph and context menu
  • Set commit templates via the Git config variable commit.template (see here for more info)
  • Hardware Acceleration: multiple performance improvements
  • Double click remote branches to create local branches in the Locations bar
  • Added Copy Repository Path to action menu
  • Added Update remote URL and Copy remote URL to remote context menu
  • Focus on the checked out branch using Ctrl+8 (Cmd+8 for MacOS)
  • Open recent commit messages using Ctrl+; (Cmd+; for MacOS)
  • Add Remote: name input is now validated
  • Updated "Pull" button to perform a fetch when in a detached HEAD state
  • Mac and Linux: open Quick Switch Repository via Ctrl+Alt+P/Cmd+Ctrl+P
  • Tweaked how the Push command is displayed in the command palette
  • Safe mode shortcuts can be disabled by creating a file in the data directory called .Disable Safe Mode Shortcut
  • Fixes:
  • Fixed cherry picks failing when the parent folder doesn't exist
  • Restored missing Continue button when a cherry pick has been paused
  • Restored missing commit button when unmerged files are present
  • Fixed up/down behavior in command palette
  • Fixed image diffs failing to load Git LFS images
  • Fixed default input focus for the files list
  • Fixed Sublime Merge opening a new window via Sublime Text integrations
  • Fixed crash when closing window
  • Disabled discard command for staged files
  • Windows: fixed globs not being expanded sometimes
  • Linux: Improved cancel/ok dialog ordering consistency

New in Sublime Merge Build 2058 Dev (Jul 21, 2021)

  • Revert Commits: revert multiple commits via the commit graph and context menu
  • Cherry Pick: added support for the-x flag
  • Add Remote: name input is now validated
  • Commit Templates: added relative path support for the commit.template setting
  • Mac and Linux: open Quick Switch Repository via Ctrl+Alt+P/Cmd+Ctrl+P
  • Hardware Acceleration: performance improvements
  • Updated Copy Repository Path to provide a native file path
  • Fixed Sublime Merge opening a new window via Sublime Text integrations
  • Fixed missing commit button when unmerged files are present
  • Fixed default input focus for the files list
  • Fixed image diffs failing to load Git LFS images
  • Fixed commit.template memory issues

New in Sublime Merge Build 2057 Dev (Jun 29, 2021)

  • Cherry pick multiple commits via the commit graph and context menu
  • Set commit templates using the Git config variable commit.template (see here for more info)
  • Focus on the checked out branch using Ctrl+8 (Cmd+8 for MacOS)
  • Double click remote branches to create local branches in the Locations bar
  • Added Update remote URL and Copy remote URL to remote context menu
  • Added Copy Repository Path to action menu
  • Open recent commit messages using Ctrl+; (Cmd+; for MacOS)
  • Updated "Pull" button to perform a fetch when in a detached HEAD state
  • Fixed cherry picks failing when the parent folder doesn't exist
  • Fixed missing Continue button when a cherry pick has been paused
  • Fixed up/down behavior in command palette
  • Fixed crash when closing window
  • Disabled discard command for staged files
  • Tweaked how the Push command is displayed in the command palette
  • Safe mode shortcuts can be disabled by creating a file in the data directory called .Disable Safe Mode Shortcut
  • OpenGL: improved rendering performance for textures and other UI elements
  • Windows: fixed globs not being expanded sometimes
  • Linux: Improved cancel/ok dialog ordering consistency

New in Sublime Merge Build 2056 (May 17, 2021)

  • Add $commit_message context variable for historical commits
  • Fix memory leak on Windows

New in Sublime Merge Build 2054 (May 4, 2021)

  • Mac releases now include native Apple Silicon binaries
  • Easily filter through large filesets using the new files filter
  • Cherry pick hunks using the … button on hunks
  • Moving the caret in diffs now scrolls the viewport
  • Added the chain command, which accepts a list of commands to run in its "commands" argument - useful for chaining Git commands together
  • Improved default selection behavior for switch repository
  • Commit message history: ensure entries are unique
  • Added support for Scroll Bar.sublime-mousemap to customize scrollbar interaction
  • Added "Report a Bug" entry in the Help menu
  • Linux: use native file dialogs, allowing use of the KDE dialogs
  • Windows: fixed clone dialog not pre-filling
  • Fixed gpg signature verification hanging
  • Fixed stale commit messages displaying when editing commit contents
  • Fixed memory issue when rebasing
  • Fixed command status popups not disappearing

New in Sublime Merge Build 2049 (Mar 12, 2021)

  • Allow command palette navigation with Tab / Shift + Tab
  • Fixed newlines appearing in the commit message history
  • Fixed blame tooltips not updating in certain circumstances
  • Fixed crash when staging files with certain file encodings
  • Windows and Mac: updated bundled Git to 2.30.2 (addresses CVE-2021-21300)
  • Windows: fixed clean and smudge filters hanging on certain files
  • Linux: improved application menu theming

New in Sublime Merge Build 2047 (Feb 23, 2021)

  • New Features:
  • Location bar: find branches easily with the new filter bar
  • Location bar: ahead / behind indicators can now be clicked to push / pull
  • Location bar: branch folders now have context menus
  • Tags: added command to checkout tags
  • Tags: added command to delete remote tags
  • Stashes: added command to delete all stashes (git stash clear)
  • Push: added --no-verify option
  • Remote branches: added command to checkout corresponding local branch
  • Custom commands: select remotes with the new select_remote selector
  • Added resize_window command
  • Added commit message tooltip to each parent in the parents section of a commit
  • Improvements:
  • Windows: upgraded the application title bar
  • Linux: upgraded the application title bar on Gnome
  • Image diffs: PSD, TGA, PPM, and PGM files now display a rich diff
  • Blame: significant loading time improvements
  • Commit graph: simplified context menus
  • Improved indentation detection
  • Switch Repository dialog: open new tabs via Ctrl key (Cmd for MacOS)
  • Updated Ctrl+R/Cmd+R to run navigate_to_branch command
  • Updated refresh command keybinding to Ctrl+Shift+H/Cmd+Shift+H
  • Updated diff titles to elide when space is limited
  • Updated theming of the files list
  • Added various syntax highlighting improvements
  • Detached HEAD state is now more explicit
  • Remember which workspace each window is in by default (controlled via the setting remember_workspace)
  • Parent folders of the currently checked out branch are now highlighted in the location bar
  • Navigation commands: a warning is displayed when exiting the merge tool
  • Askpass dialog now supports fingerprint input
  • Askpass dialog now detects keypad Enter
  • Added themed_title_bar setting
  • Menu files: added submenu IDs
  • Interactive rebase: the break flag is now supported
  • Mac: improved OpenGL rendering performance
  • Windows and Mac: Updated bundled Git to 2.29.2
  • Linux: added various performance optimisations
  • Fixes:
  • Editing commits now signs the edited commits
  • Added back missing progress bar for long-running commands
  • Fixed newly cloned repositories not loading preferences
  • Previous commit messages are now saved per-repository
  • Fixed incorrect context menus displaying in location bar
  • Improved compatibility on filesystems with large timestamp imprecision
  • Fixed inability to revert files if their parent directory does not exist
  • Fixed crash when closing the preferences page
  • Fixed empty selections being rendered as a line
  • Fixed window positions not restoring correctly in certain situations
  • Mac: smerge now correctly restores window positions
  • Mac: updated icon to follow macOS 11 style
  • Mac: added a workaround for Apple M1 OpenGL graphics driver bug that caused text to be rendered incorrectly
  • Mac: fixed bug in batching of large Git commands
  • Mac: added workaround for the command line helper when app translocation is in effect
  • Windows: added a workaround for Intel OpenGL graphics driver bug that caused black bars at the top of some windows
  • Windows: fixed glyph rendering bugs
  • Windows: fixed flashing when using OpenGL and resizing a window
  • Windows: fixed bug in subpixel antialiasing
  • Linux and Mac: fixed clean and smudge filters hanging on certain files
  • Linux: fixed bug with the caret not moving after performing a text drag
  • Linux: fixed freezing on KDE Plasma

New in Sublime Merge Build 2039 (Nov 16, 2020)

  • Updated Ctrl+R/Cmd+R to run navigate_to_branch command
  • Updated refresh command keybinding to Ctrl+Shift+H/Cmd+Shift+H
  • Fixed crash when closing the preferences page
  • MacOS: fixed bug in batching of long Git commands

New in Sublime Merge Build 2038 (Oct 30, 2020)

  • New Features and Improvements:
  • Added commit graph theming improvements - branch colors now match graph edge colors
  • Updated custom git commands to support launching editor
  • Updated custom git commands to allow for selecting branches and other refs - see the docs for details
  • Improved commit dialog scroll tracking
  • Added navigate_to_stash command
  • Added Drop Stash… to the command palette
  • Tweaked merge algorithm to merge nearby conflicts
  • Updated clone page to trim leading and trailing whitespace
  • Updated create_branch/rename_branch command to convert whitespace to hyphens
  • Improved lexer performance
  • Preferences:
  • Added editor_wait_args to preferences
  • Added preference set GIT_SSH env var (useful for overriding the default SSH client)
  • Updated preference categories
  • Git:
  • Updated image diff file size limit
  • Fixed bug were commits only reachable by tags were not visible
  • Fixed edge case bug when staging single lines
  • Fixed revert hunk displaying success message in some failure cases
  • Fixed bug where some Scalar pack files weren't loaded
  • Windows: fixed bug with git config path resolution
  • Miscellaneous Fixes:
  • Fixed incorrect ordering of commit dialog tabs
  • Fixed smerge not preserving session information in some situations
  • Fixed session loading bug with multiple repository tabs
  • Fixed bug with Korean IME
  • Fixed commit summary sizing bug
  • Fixed inability to scroll to the end of the commit dialog in some circumstances
  • Fixed invalid initialize submodule menu item
  • Renamed Show Branch… to Show Hidden Branch…
  • Fixed edge-case in delete_remote command
  • Fixed theme reloading twice
  • Fixed clone page not receiving input focus by default
  • OpenGL: fixed rendering issue due to AMD driver bug on Windows
  • OpenGL: fixed blurry checkboxes
  • OpenGL: improved bold rendering with bugged intel drivers
  • Syntax Definitions: fixed infinite loop bug
  • Syntax Definitions: renamed TypeScript to TSX, and added a new vanilla TypeScript syntax

New in Sublime Merge Build 2032 (Aug 25, 2020)

  • New Features and Improvements:
  • Added full file diffs - click the toggle button in the hunk header to toggle between individual changes and the full file
  • Added Git LFS image diff support
  • Improved performance when loading image diffs
  • Added history dropdown to the search page
  • Added tab selector to the repository tab bar
  • Improved --set-upstream behavior
  • Linux: added touch event handling
  • Rendering:
  • Fixed an OpenGL text rendering issue
  • OpenGL: fixed glyph corruption due to an AMD driver bug on Windows
  • Mac: fixed rendering bug
  • Diffs:
  • Fixed clean filters not applying to modified files
  • Fixed context dragger not displaying for some diffs
  • Fixed scrolling behavior regression in commit dialog
  • Windows: fixed directory junctions being marked as untracked
  • Fixed line-based operations failing occasionally
  • Miscellaneous Fixes:
  • Updated show_all_refs to display when any refs are hidden
  • Fixed incorrect context menu behavior when the underlying controls are updated
  • Fixed signed tags failing when no tag message is supplied
  • Fixed custom themes not loading into askpass dialogs
  • Fixed input focus handling in commit dialog
  • Improved scrolling behavior in preferences page
  • Windows: fixed crash on Windows due to IME
  • Windows: fixed clone page not automatically populating source URL
  • Windows: fixed bug in open_dir_in_sublime_text
  • Mac: added support for editor arguments in preferences
  • Windows: fixed crash when window edge overlaps with faded text

New in Sublime Merge Build 2027 (Aug 7, 2020)

  • Fixed high memory usage associated with image diffs
  • Windows: fixed open_dir_in_sublime_text sometimes missing on Windows

New in Sublime Merge Version 2 (Aug 7, 2020)

  • Features and Flexibility:
  • From the first release of Sublime Merge, we talked about the simple joy of software that ‘gets it really right’. For our team it means going beyond the minimum, making software as good as it can be, and paying attention to the details.
  • It’s been almost two years since Sublime Merge was launched, and our focus hasn’t changed. Our aim for the newest update was to ‘get it really right’ when it comes to flexibility and customization.
  • Our community uses Sublime Merge in many different ways; from reviewing commits on a tablet, to writing thousands of lines of code on a desktop computer.
  • The latest version of Sublime Merge is packed full of upgrades, but we want to highlight some of the ways we’re giving you flexibility in the way you work. We’ve included the full list of changes at the bottom of this post (spoiler: there’s a lot)
  • Repository-Level Tabs - use tabs to quickly navigate between multiple repositories
  • Upgraded Commit UI - focus on what’s important with an upgraded commit UI
  • Flexible Layouts - adapt the layout to fit your context and workflow
  • Hardware Acceleration - harness your device's power with OpenGL rendering
  • To get started straight away, visit the download page.
  • Tabs. Tabs. Tabs:
  • As developers, we know that windows can be cumbersome. We want to give you the tools you need to focus on your work, not on managing windows.
  • The new update provides the flexibility to view all your projects in one window.
  • Repository Level Tabs:
  • Upgraded Commit UI:
  • We’ve re-worked the commit UI to support different workflows. You can now configure the commit message position, and toggle between individual files using file tabs. You’ll also notice the new file stats.
  • Upgraded Commit UI:
  • Your Git Client. Your Layout:
  • With the wide variety of displays available today, it’s important to have a flexible layout that works for you. Starting today, you can simply select the layout that fits your set up. Whether you’re on your 4K desktop screen, your work laptop, or even a tablet, we’ve got you covered.
  • Flexible Layouts:
  • Even Faster:
  • We're excited to announce support for hardware acceleration in Sublime Merge. Powered by OpenGL, this will deliver significant rendering performance improvements on all platforms. It is enabled by default on MacOS, and can be controlled via the advanced section of the preferences.