Name: Sublime Merge
Author: Sublime HQ Pty Ltd

LLVM 17

LLVM 17 stable compiler and tools extension for the flatpak Freedesktop SDK

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

Sublime Merge

BUILD 2056<ul><li>Add $commit_message context variable for historical commits</li><li>Fix memory leak on Windows</li></ul>

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

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

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

Build 2039<ul><li>Updated Ctrl+R/Cmd+R to run navigate_to_branch&gt; command</li><li>Updated refresh command keybinding to Ctrl+Shift+H/Cmd+Shift+H</li><li>Fixed crash when closing the preferences page</li><li>MacOS: fixed bug in batching of long Git commands</li></ul>

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

Build 2032New Features and Improvements 💎<ul><li>Added full file diffs - click the toggle button in the hunk header to toggle between individual changes and the full file</li><li>Added Git LFS image diff support</li><li>Improved performance when loading image diffs</li><li>Added history dropdown to the search page</li><li>Added tab selector to the repository tab bar</li><li>Improved --set-upstream behavior</li><li>Linux: added touch event handling</li></ul>Rendering 🎨<ul><li>Fixed an OpenGL text rendering issue</li><li>OpenGL: fixed glyph corruption due to an AMD driver bug on Windows</li><li>Mac: fixed rendering bug</li></ul>Diffs 📃<ul><li>Fixed clean filters not applying to modified files</li><li>Fixed context dragger not displaying for some diffs</li><li>Fixed scrolling behavior regression in commit dialog</li><li>Windows: fixed directory junctions being marked as untracked</li><li>Fixed line-based operations failing occasionally</li></ul>Miscellaneous Fixes 🐞<ul><li>Updated show_all_refs to display when any refs are hidden</li><li>Fixed incorrect context menu behavior when the underlying controls are updated</li><li>Fixed signed tags failing when no tag message is supplied</li><li>Fixed custom themes not loading into askpass dialogs</li><li>Fixed input focus handling in commit dialog</li><li>Improved scrolling behavior in preferences page</li><li>Windows: fixed crash on Windows due to IME</li><li>Windows: fixed clone page not automatically populating source URL</li><li>Windows: fixed bug in open_dir_in_sublime_text</li><li>Mac: added support for editor arguments in preferences</li><li>Windows: fixed crash when window edge overlaps with faded text</li></ul><ul/>Build 2027<ul><li>Fixed high memory usage associated with image diffs</li><li>Windows: fixed open_dir_in_sublime_text sometimes missing on Windows</li></ul>BUILD 2025New Features and Improvements 💎<ul><li>Added image diffs</li><li>Added Revert Hunk</li><li>Added rename_remote command</li><li>Added --set-upstream option to push menu</li><li>Added always_show_command_status preference</li><li>Commit Signatures: added GPG4Win support</li><li>Search: added tree operator, which matches commits with the given tree hash</li><li>Improved merge algorithm for merge tool</li><li>Improved gitflow finish support</li><li>Added drag-drop support to welcome page</li></ul>Rendering 🎨<ul><li>Fixed several OpenGL related rendering issues</li><li>Color Schemes: Fixed text background drawing over underlines</li></ul>Syntax Definitions 📝<ul><li>Added out of the box support for TypeScript and JSX, with thanks to</li><li>Added "extends" keyword in .sublime-syntax</li><li>Added "version: 2" in .sublime-syntax to fix edge cases while retaining backwards compatibility</li><li>Added lazy loading of external "embed" actions</li><li>Reduced cache size on disk</li><li>Prevent infinite include loops via with_prototype</li><li>Improved matching performance and memory usage</li><li>Added "hidden_extensions" in .sublime-syntax</li><li>Allow combining "pop" with "push"/"set"/"embed"/"branch"</li><li>Fixed a number of scope related bugs</li><li>Fixed some regex capture related bugs</li></ul>Input Handling ⌨️<ul><li>Added forward and back navigation to mousemap</li><li>Mac: Fixed ctrl+mouse1 not matching the behavior of mouse2</li><li>Windows: Fixed IME bugs</li></ul>Miscellaneous Fixes 🐞<ul><li>Windows: safe mode is now activated via shift+alt</li><li>Search: fixed typographical error</li><li>Fixed git command output scrolling when output overflows dialog</li><li>Fixed freeze when switching tabs while command palette is open</li><li>Fixed some symlinks being incorrectly marked as modified on Windows</li><li>Session is now saved when application is notified of system shutdown</li><li>Improved contrast between selected and unselected repository tabs</li><li>Fixed minor file tab theming bugs</li><li>Fixed crash when core.ignorecase is enabled</li><li>Fixed crash when navigating to a commit message while rebasing</li><li>Location Bar: fixed incorrect branch count with nested branches</li><li>Files Bar: fixed selection regression in tree view</li><li>Fixed selection bug in command palette</li></ul>

BUILD 2020General<ul><li>New UI, including repository tabs</li><li>GPU Rendering</li><li>UI: Reworked Commit Dialog</li><li>UI: Added repository tabs, to have multiple repositories open in a single window</li><li>UI: Added file tabs when viewing the contents of a commit</li><li>Implement commit signature creation and validation</li><li>Added a lines changed indicator to commits</li><li>Added command history, available from the Show Git Output icon in the tool bar</li><li>Added commit message history, available from the dropdown arrow in the commit message box</li><li>Added support for non-overlay scrollbars in diffs</li><li>Added Resolve Ours / Resolve Theirs dropdown to unmerged files</li><li>URLs in commit messages and git output can be opened via the context menu</li><li>Left and Right keys can be used to expand/collapse merge commits</li><li>Added Navigate/Go to Child</li><li>Stash commands no longer supply -q by default, to work around a bug in Git 2.24</li><li>Checking out a hidden ref will make the ref visible</li><li>Add Recent Repositories to Welcome Page</li><li>Search: Added before and after operators</li><li>Added set_preference and toggle_preference commands</li><li>Added gitflow publish support</li><li>Preferences: Updating settings via the preferences dialog no longer clears comments in the settings file</li><li>Preferences: Added Preferences entry for Ignore Whitespace in diffs</li><li>Added checks for pushDefault and pushRemote when pushing</li><li>Added Tools/Show Console</li><li>Improved selection behavior while loading large repositories</li><li>Improved menu auto hide behavior on Linux and Windows</li><li>Improved performance with a very large number of untracked or modified files</li><li>Improved performance in repositories with a large number of authors</li><li>Running smerge without any arguments will focus the current window, if any</li><li>Fixed not being able to commit when email is set to empty string</li><li>Fixed a bug in destination path calculation in the clone dialog</li><li>Fixed Create Tag with an empty message creating the tag incorrectly</li><li>Fixed hunk staging using the wrong encoding in some scenarios</li><li>Fixed shift+enter staging a file even when focus is in commit message box</li></ul>Merge Tool<ul><li>Indentation settings are now automatically detected from the contents of the file</li><li>Saving a file with unresolved conflicts will warn before saving</li><li>Added a preference to trim trailing whitespace on save</li></ul>GPU Rendering<ul><li>New hardware_acceleration setting will composite the UI on the GPU</li><li>By default, GPU rendering is enabled on Mac, and disabled on Windows and Linux. This can be changed via the Preferences dialog.</li><li>Details about the active GPU will be displayed in the Console</li></ul>Git<ul><li>Git: Added support for smudge and clean filters, enabling Git LFS support</li><li>Git: Improved handling of the working-tree-encoding attribute</li><li>Git: Improved parsing of .gitattributes files</li><li>Git: Added support for GUI encoding config</li><li>Windows and Mac: Updated bundled Git to 2.26.2</li><li>Windows: Fixed core.worktree support</li><li>Submodules: Added Initialize All Submodules context menu</li><li>Submodules: The location bar now indicates the value of HEAD for each submodule</li></ul>Editor Control<ul><li>Expanded draw_white_space setting, supporting leading and trailing white space</li><li>Unicode white space characters, such as the zero width no-break space, are now drawn as hex values. Controlled via draw_unicode_white_space setting.</li><li>Spell Checking: Added support for languages with upper case characters after start of word</li><li>Spell Checking: Updated dictionaries</li><li>Spell Checking: Added support for non-utf8 dictionaries</li><li>Spell Checking: System dictionaries are now available on Linux</li><li>Spell Checking: Dictionaries in ~/Library/Spelling are now available on Mac</li><li>Linux: Text drag and drop is now supported</li><li>Linux: Added support for alternate font weight names</li><li>Linux: Selection is no longer cleared when another application makes a selection</li></ul>Text Commands<ul><li>Improved behavior of Wrap Paragraph</li><li>Improved behavior of Swap Lines</li><li>Added Selection/Expand Selection as a general mechanism to expand the selection</li><li>Selection/Split into Lines will now split a selection into words if the selection doesn't contain any newlines</li><li>Fixed swap_line_down not being able to swap an empty line onto the last line of a file</li></ul>Input Handling<ul><li>Modifier key taps can now be used as part of a key binding. For example, ["ctrl", "ctrl"] will trigger when Ctrl is pressed twice without pressing any other keys in between.</li><li>Linux: AltGr can now be used in key bindings via altgr</li><li>Linux: Added a workaround for a touchscreen driver bug, which would cause right click and mouse scrolling to stop working</li><li>Linux: When the menu is hidden, pressing alt will show it</li><li>Linux: Improved compatibility with some keyboard layouts</li><li>Mac: Fix Pinyin input</li><li>Mac: Keypad keys can now be bound to as expected</li><li>Mac: Improved compatibility with some keyboard layouts</li><li>Windows, Linux: Hide mouse cursor when typing. Controlled via hide_pointer_while_typing setting.</li><li>Windows, Linux: Fixed being unable to bind Ctrl+Break</li><li>Windows: Improved IME support</li><li>Windows, Linux: Added Shift+F10 key binding to open the context menu</li></ul>UI<ul><li>Added highlight_gutter and highlight_line_number settings</li><li>Themes now have a style property for title_bar element, for better integration with OS "dark modes"</li><li>Color Schemes: Added glow font option to color schemes</li><li>Color Schemes: Added support for the underline font style</li><li>Linux: Show sequential key bindings in the menu</li><li>Linux: Fixed context menu position being slightly offset</li></ul>Rendering<ul><li>Windows, Linux: Added support for per-display subpixel ordering</li><li>Mac: Improved window resize performance</li><li>Windows: Fixed rendering bug where other applications could cause persistent artifacts via window animations</li></ul>Application Behavior<ul><li>Added Safe Mode, to simulate a clean install. Enabled by passing --safe-mode on the command line.</li><li>Holding down Shift on Windows, or Option on macOS, will start Sublime Merge in Safe Mode</li><li>Settings containing a UTF-8 BOM will no longer fail to load</li></ul>Syntax Definitions<ul><li>Added ability to "branch" within syntax definitions, for non-deterministic or multi-line constructs</li><li>Many syntax highlighting improvements, including significant improvements to:</li><li>Improved syntax definition load time</li><li>Fixed a performance issue with bounded repeats in regular expressions</li></ul>

BUILD 1119<ul><li>Fixed a regression where pack files over 32GB weren't being opened</li><li>Mac: Added Notarization</li></ul>

BUILD 1116<ul><li>Large files are now only diffed when clicked on</li><li>Merge Tool: Added Take Left and Take Right options</li><li>Merge Tool: Can now Save and Stage in one action</li><li>--no-verify can be passed when committing</li><li>Rebase Commit is now available in the context menu for all commits</li><li>Revert Commit now works with merge commits</li><li>Added separate key bindings for Stage All and Stage All Modified files for clarity</li><li>Added an explicit close button to the search bar</li><li>Table of Contents: Clicking an already selected row no longer closes the diff</li><li>Various syntax highlighting improvements</li><li>Improved behavior when doing a line restricted file history search and toggling ignore whitespace</li><li>Added support for the intent-to-add flag in the index</li><li>Fixed includeIf handling in git config files not interpreting ~ relative paths correctly</li><li>Fixed UTF8 BOMs not being handled correctly in .gitignore files</li><li>Fixed Edit Commit Message not working in work trees</li><li>Fixed standalone merge tool not supporting the key binding for Next Conflict</li><li>Fixed smerge mergetool not handling relative paths correctly</li><li>Fixed smerge log &lt;dir&gt; not working as expected</li><li>Mac: Added a workaround for a macOS OpenGL driver bug in 10.14.4</li><li>Linux: Fixed incorrect file ownership in the deb packages</li><li>Linux: Added support for text drag and drop</li><li>Linux: Improved high dpi handling under KDE</li></ul>

BUILD 1107<ul><li>The Contents section of the sidebar can now be switched between showing changed files and all files</li><li>Sublime Merge can now be used as a standalone merge tool, via the smerge command line helper. See smerge --help for details.</li><li>Merge tool: Improved UI for switching between the Base file and the Merged file</li><li>Added Navigate/Go to Parent menu item</li><li>Improved clone dialog</li><li>Improved side bar context menus</li><li>Various syntax highlighting improvements</li><li>Merge tool now indicates which lines have been modified in the merged file</li><li>Merge tool: swap_line_up, swap_line_down and duplicate_line commands are now supported</li><li>Fixed git flow commands appearing inconsistently</li><li>Mac: Add full support for macOS native tabs</li><li>Mac: Ensure context menus are shown without scrolling</li><li>Mac: Error message dialogs can now be closed with the escape key</li><li>Linux: Color glyphs are now drawn properly on light backgrounds</li><li>Windows: Fix DirectWrite handling of fonts with lineGap &gt; 0</li></ul>

BUILD 1103<ul><li>New Preferences Dialog</li><li>New Merge Dialog</li><li>Added support for includeIf in Git config files</li><li>Various syntax highlighting improvements</li><li>Improved IME compatibility</li><li>Added Navigate to Branch</li><li>Added Navigate to Tag</li><li>Added Set Branch Upstream to the Command Palette</li><li>Added Hide Branch to the branch context menu</li><li>Added Hard Reset option to the diverged banner</li><li>The diverged banner now shows the exact git commands that will be run in tooltips</li><li>Improved behavior of clone dialog when selecting a target directory</li></ul>

BUILD 1097<ul><li>Various syntax highlighting improvements</li><li>Fixed backspace not discarding selected lines</li><li>GTK3 + Wayland compatibility fixes</li><li>Fixed GTK3 double and triple click handling</li><li>Fixed a crash when using GTK_IM_MODULE=xim</li></ul>

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

A sophisticated text editor for code, markup and prose.

Sublime Text

Sophisticated text editor for code, markup and prose

Sublime Merge

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

バージョン 2091 の変更点

所有権あり

Sublime HQ Pty Ltd の他のアプリ