-
Notifications
You must be signed in to change notification settings - Fork 5
/
com.sublimemerge.App.metainfo.xml
692 lines (682 loc) · 38.5 KB
/
com.sublimemerge.App.metainfo.xml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>com.sublimemerge.App</id>
<name>Sublime Merge</name>
<project_license>LicenseRef-proprietary=https://www.sublimetext.com/eula</project_license>
<developer id="com.sublimehq">
<name>Sublime HQ Pty Ltd</name>
</developer>
<summary>Sublime Merge is a Git client, from the makers of Sublime Text</summary>
<metadata_license>CC0-1.0</metadata_license>
<url type="homepage">https://www.sublimemerge.com/</url>
<url type="bugtracker">https://github.com/sublimehq/sublime_merge</url>
<url type="help">https://forum.sublimetext.com/c/sublime-merge</url>
<launchable type="desktop-id">com.sublimemerge.App.desktop</launchable>
<description>
<p>Sublime Merge is a Git client, from the makers of Sublime Text. Line-by-line Staging. Commit Editing. Unmatched Performance.</p>
</description>
<screenshots>
<screenshot type="default">
<caption>The commit view</caption>
<image type="source">https://raw.githubusercontent.com/flathub/com.sublimemerge.App/master/screenshot-commit.png</image>
</screenshot>
<screenshot>
<caption>Searching through the log</caption>
<image type="source">https://raw.githubusercontent.com/flathub/com.sublimemerge.App/master/screenshot-search.png</image>
</screenshot>
<screenshot>
<caption>Merge conflict resolution</caption>
<image type="source">https://raw.githubusercontent.com/flathub/com.sublimemerge.App/master/screenshot-conflict.png</image>
</screenshot>
</screenshots>
<releases>
<release version="2102" date="2024-10-28">
<description></description>
</release>
<release version="2096" date="2024-04-22"/>
<release version="2091" date="2023-08-23"/>
<release version="2083" date="2023-02-06"/>
<release version="2079" date="2022-11-13"/>
<release version="2077" date="2022-08-23"/>
<release version="2074" date="2022-06-09">
<description>
<p>Build 2074</p>
<p>New Features and Improvements</p>
<ul>
<li>Application: Added dialog to mark unsafe repositories as safe</li>
<li>Tags: Added tags to checkout command</li>
<li>Search: file and path queries now support absolute paths and Windows-style paths</li>
<li>Files List: Added context menu for commit files</li>
<li>Revert: Added warning when checking out a branch when a revert is in progress</li>
<li>Various syntax highlighting improvements</li>
<li>Added ruler_style setting</li>
</ul>
<p>Fixes</p>
<ul>
<li>Submodules: Fixed submodule diffs showing outdated hashes</li>
<li>Files List: Fixed discard filtered files ignoring the filter</li>
<li>Files List: Fixed files list filter applying to commit dialog context menus</li>
<li>Navigation: Fixed tab-navigation focusing on hidden dialogs</li>
<li>Filters: Fixed certain filters causing the application to hang</li>
<li>Commit Message: Removed extra padding in commit message input</li>
<li>Mac: Fixed bundled Git compatibility</li>
<li>Mac: Fixed context menu input focus bug</li>
</ul>
</description>
</release>
<release version="2071" date="2022-04-25">
<description>
<p>Build 2071</p>
<p>New Features and Improvements</p>
<ul>
<li>Files List: Stage filtered files using the file section context menus</li>
<li>Improved interface for staging/unstaging large changesets</li>
<li>Commit List: Added keyboard support for opening context menus</li>
<li>Branches: Combined all checkout commands into a single command</li>
<li>Branches: Added ability to unset upstreams</li>
<li>Search: Added auto-matching for quotes</li>
<li>Submodules: Added support for non-absorbed submodules</li>
<li>Create Tag: Added warning when tag name is invalid</li>
</ul>
<p>Fixes</p>
<ul>
<li>Fixed scroll position being lost when dropping a commit</li>
<li>Fixed scroll tracking when staging large files</li>
<li>Fixed commit message container layout issues</li>
<li>Fixed hunk container layout issue for large hunks</li>
<li>Fixed OpenGL rendering issue related to the wrong context being active</li>
<li>Fixed shadow related OpenGL rendering bug</li>
<li>Fixed potential for corrupted menu items in commit message history</li>
<li>Fixed back button not working in file history</li>
<li>Syntax Highlighting: Fixed crash caused by starting a branch point at the end of a line</li>
<li>Windows and Mac: Updated bundled Git to 2.35.3 (addresses CVE-2022-24765 and CVE-2022-24767)</li>
<li>Mac: Fixed Ctrl+Mouse1 not opening commit graph context menus</li>
<li>Mac: Added work around for broken modal loops</li>
<li>Linux: Follow system scroll bar overlay setting</li>
<li>Linux: Fixed various issues caused by the C locale</li>
</ul>
</description>
</release>
<release date="2021-12-21" version="0.2068">
<description>
<p>BUILD 2068</p>
<p>New Features and Improvements</p>
<ul>
<li>Search: Quickly write queries with auto-complete suggestions</li>
<li>Improved OpenGL rendering performance by automatically batching together controls</li>
<li>Fetch / Pull Command: Added ability to fetch tags</li>
<li>Merge Command: Merge unrelated histories using the allow-unrelated-histories flag</li>
<li>Set Upstream Command: Indicate the current upstream in the list of remote branches</li>
<li>Commit Details: Added context menus to commit metadata items</li>
<li>Commit Dialog: Stage submodule changes using Enter</li>
<li>Commit Messages: Added support for strip and default modes of commit.cleanup</li>
<li>Commit Messages: Warn when commit message only contains comments</li>
<li>Context Variables: Access the in-progress commit message via the commit_message variable</li>
<li>Settings: Highlight missing signatures and public keys as errors with signature_error_highlighting</li>
<li>Settings: Added draw_unicode_bidi setting, which is enabled by default</li>
<li>Recent Repositories: Added Clear missing menu item</li>
<li>Recent Repositories: Prompt to remove from list when opening non-existent repositories</li>
<li>Clone Page: Added tooltips to clone page inputs</li>
</ul>
<p>Fixes</p>
<ul class="topic">
<li>Commit Editing: Fixed author information being updated</li>
<li>Fixed lines with whitespace preceding comment characters being treated as comments</li>
<li>Fixed light changelog displaying when dark theme is enabled</li>
<li>Fixed crash when selecting previous commit messages containing certain UTF-8 sequences</li>
<li>Fixed issue with rebase branch preview</li>
<li>Fixed data corruption potentially occurring if a crash happens while saving the session</li>
<li>Fixed crash when filtering table of contents</li>
<li>Windows: Fixed crash when OpenGL initialization fails</li>
<li>Mac and Windows: Fixed command line / terminal not taking focus after waiting</li>
<li>Mac: Fixed Window > Merge All Windows merging minimized windows</li>
<li>Mac: Fixed native tabs restoration resulting in odd behavior</li>
<li>Linux: Added missing libcurl dependency for package managers</li>
</ul>
</description>
</release>
<release date="2021-07-23" version="0.2059">
<description>
<p>BUILD 2059</p>
<p>New Features and Improvements</p>
<ul class="topic">
<li>Cherry Pick multiple commits via the commit graph and context menu</li>
<li>Cherry Pick: added support for the -x flag</li>
<li>Revert multiple commits via the commit graph and context menu</li>
<li>Set commit templates via the Git config variable commit.template</li>
<li>Hardware Acceleration: multiple performance improvements</li>
<li>Double click remote branches to create local branches in the Locations bar</li>
<li>Added Copy Repository Path to action menu</li>
<li>Added Update remote URL and Copy remote URL to remote context menu</li>
<li>Focus on the checked out branch using Ctrl+8 (Cmd+8 for MacOS)</li>
<li>Open recent commit messages using Ctrl+; (Cmd+; for MacOS)</li>
<li>Add Remote: name input is now validated</li>
<li>Updated "Pull" button to perform a fetch when in a detached HEAD state</li>
<li>Mac and Linux: open Quick Switch Repository via Ctrl+Alt+P/Cmd+Ctrl+P</li>
<li>Tweaked how the Push command is displayed in the command palette</li>
<li>Safe mode shortcuts can be disabled by creating a file in the data directory called. Disable Safe Mode Shortcut</li>
</ul>
<p>Fixes</p>
<ul class="topic">
<li>Fixed cherry picks failing when the parent folder doesn't exist</li>
<li>Restored missing Continue button when a cherry pick has been paused</li>
<li>Restored missing commit button when unmerged files are present</li>
<li>Fixed up/down behavior in command palette</li>
<li>Fixed image diffs failing to load Git LFS images</li>
<li>Fixed default input focus for the files list</li>
<li>Fixed Sublime Merge opening a new window via Sublime Text integrations</li>
<li>Fixed crash when closing window</li>
<li>Disabled discard command for staged files</li>
<li>Windows: fixed globs not being expanded sometimes</li>
<li>Linux: Improved cancel/ok dialog ordering consistency</li>
</ul>
</description>
</release>
<release date="2021-05-17" version="0.2056">
<description>
<p>BUILD 2056</p>
<ul>
<li>Add $commit_message context variable for historical commits</li>
<li>Fix memory leak on Windows</li>
</ul>
</description>
</release>
<release date="2021-05-04" version="0.2054">
<description>
<p>BUILD 2054</p>
<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>
</description>
</release>
<release date="2021-03-12" version="0.2049">
<description>
<p>BUILD 2049</p>
<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>
</description>
</release>
<release date="2021-02-23" version="0.2047">
<description>
<p>BUILD 2047</p>
<p>New Features</p>
<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>
<p>Improvements</p>
<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>
<p>Fixes</p>
<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>
</description>
</release>
<release date="2020-11-16" version="0.2039">
<description>
<p>Build 2039</p>
<ul>
<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>Fixed crash when closing the preferences page</li>
<li>MacOS: fixed bug in batching of long Git commands</li>
</ul>
</description>
</release>
<release date="2020-10-30" version="0.2038">
<description>
<p>Build 2038</p>
<p>New Features and Improvements 💎</p>
<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>
<p>Preferences 🎚️</p>
<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>
<p>Git ⚙️</p>
<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>
<p>Miscellaneous Fixes 🐞</p>
<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>
</description>
</release>
<release date="2020-07-22" version="0.2025">
<description>
<p>Build 2032</p>
<p>New Features and Improvements 💎</p>
<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>
<p>Rendering 🎨</p>
<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>
<p>Diffs 📃</p>
<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>
<p>Miscellaneous Fixes 🐞</p>
<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>
</ul>
<p>Build 2027</p>
<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>
<p>BUILD 2025</p>
<p>New Features and Improvements 💎</p>
<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>
<p>Rendering 🎨</p>
<ul>
<li>Fixed several OpenGL related rendering issues</li>
<li>Color Schemes: Fixed text background drawing over underlines</li>
</ul>
<p>Syntax Definitions 📝</p>
<ul>
<li>Added out of the box support for TypeScript and JSX, with thanks to Thomas Smith</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>
<p>Input Handling ⌨️</p>
<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>
<p>Miscellaneous Fixes 🐞</p>
<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>
</description>
</release>
<release date="2020-05-26" version="0.2020">
<description>
<p>BUILD 2020</p>
<p>General</p>
<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>
<p>Merge Tool</p>
<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>
<p>GPU Rendering</p>
<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>
<p>Git</p>
<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>
<p>Editor Control</p>
<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>
<p>Text Commands</p>
<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>
<p>Input Handling</p>
<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>
<p>UI</p>
<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>
<p>Rendering</p>
<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>
<p>Application Behavior</p>
<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>
<p>Syntax Definitions</p>
<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: Erlang, with thanks to deathaxe</li>
<li>Improved syntax definition load time</li>
<li>Fixed a performance issue with bounded repeats in regular expressions</li>
</ul>
</description>
</release>
<release date="2019-09-30" version="0.1119">
<description>
<p>BUILD 1119</p>
<ul>
<li>Fixed a regression where pack files over 32GB weren't being opened</li>
<li>Mac: Added Notarization</li>
</ul>
</description>
</release>
<release date="2019-06-03" version="0.1116">
<description>
<p>BUILD 1116</p>
<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 <dir> 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>
</description>
</release>
<release date="2019-03-12" version="0.1107">
<description>
<p>BUILD 1107</p>
<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 > 0</li>
</ul>
</description>
</release>
<release date="2019-01-24" version="0.1103">
<description>
<p>BUILD 1103</p>
<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>
</description>
</release>
<release date="2018-12-06" version="0.1097">
<description>
<p>BUILD 1097</p>
<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>
</description>
</release>
</releases>
<content_rating type="oars-1.1"/>
<update_contact>philip_AT_endlessm.com</update_contact>
</component>