From 01f55f7ab38e1e4aabd1b9cebe777b9dd766fd5c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Jun 2026 11:25:51 +0800
Subject: [PATCH 01/42] ux: new style for page switcher in repository

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Repository.axaml | 46 +++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 02ac9868fa..f00001ba18 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -58,7 +58,7 @@
               <Style Selector="Path.icon">
                 <Setter Property="Width" Value="12"/>
                 <Setter Property="Height" Value="12"/>
-                <Setter Property="Margin" Value="8,0,6,0"/>
+                <Setter Property="Margin" Value="6,0"/>
                 <Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/>
               </Style>
               <Style Selector="TextBlock.header">
@@ -70,13 +70,16 @@
                 <Setter Property="Margin" Value="0"/>
                 <Setter Property="Padding" Value="0"/>
                 <Setter Property="BorderThickness" Value="0"/>
-                <Setter Property="CornerRadius" Value="4"/>
+                <Setter Property="CornerRadius" Value="0"/>
               </Style>
-              <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+              <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter, ListBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter">
                 <Setter Property="Background" Value="Transparent"/>
               </Style>
-              <Style Selector="ListBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="Background" Value="{DynamicResource Brush.AccentHovered}"/>
+              <Style Selector="ListBoxItem:selected">
+                <Setter Property="BorderBrush" Value="{DynamicResource Brush.FG1}"/>
+              </Style>
+              <Style Selector="ListBoxItem:selected Rectangle.indicator">
+                <Setter Property="Fill" Value="{DynamicResource Brush.FG1}"/>
               </Style>
               <Style Selector="ListBoxItem:selected TextBlock.header">
                 <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
@@ -93,10 +96,11 @@
             </ListBox.ItemsPanel>
 
             <ListBoxItem>
-              <Grid ColumnDefinitions="Auto,*,Auto">
-                <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Histories}"/>
-                <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Histories}"/>
-                <Button Grid.Column="2"
+              <Grid ColumnDefinitions="4,Auto,*,Auto">
+                <Rectangle Grid.Column="0" Classes="indicator" Width="4" Height="20" VerticalAlignment="Center"/>
+                <Path Grid.Column="1" Classes="icon" Data="{StaticResource Icons.Histories}"/>
+                <TextBlock Grid.Column="2" Classes="header" Text="{DynamicResource Text.Histories}"/>
+                <Button Grid.Column="3"
                         Classes="icon_button"
                         Width="26" Height="26"
                         Click="OnOpenAdvancedHistoriesOption"
@@ -107,10 +111,11 @@
             </ListBoxItem>
 
             <ListBoxItem IsVisible="{Binding !IsBare}">
-              <Grid ColumnDefinitions="Auto,*,Auto,Auto,Auto">
-                <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Changes}"/>
-                <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.WorkingCopy}"/>
-                <Border Grid.Column="2"
+              <Grid ColumnDefinitions="4,Auto,*,Auto,Auto,Auto">
+                <Rectangle Grid.Column="0" Classes="indicator" Width="4" Height="20" VerticalAlignment="Center"/>
+                <Path Grid.Column="1" Classes="icon" Data="{StaticResource Icons.Changes}"/>
+                <TextBlock Grid.Column="2" Classes="header" Text="{DynamicResource Text.WorkingCopy}"/>
+                <Border Grid.Column="3"
                         Height="18"
                         Margin="6,0" Padding="9,0"
                         CornerRadius="9"
@@ -122,13 +127,13 @@
                              FontFamily="{DynamicResource Fonts.Monospace}"
                              FontSize="10"/>
                 </Border>
-                <Path Grid.Column="3"
+                <Path Grid.Column="4"
                       Width="12" Height="12"
                       Margin="0,0,6,0"
                       Data="{StaticResource Icons.Info}"
                       Fill="DarkOrange"
                       IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"/>
-                <Button Grid.Column="4"
+                <Button Grid.Column="5"
                         Classes="icon_button"
                         Width="26" Height="26"
                         Command="{Binding DiscardAllChanges}"
@@ -139,10 +144,11 @@
             </ListBoxItem>
 
             <ListBoxItem IsVisible="{Binding !IsBare}">
-              <Grid ColumnDefinitions="Auto,*,Auto,Auto">
-                <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Stashes}"/>
-                <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Stashes}"/>
-                <Border Grid.Column="2"
+              <Grid ColumnDefinitions="4,Auto,*,Auto,Auto">
+                <Rectangle Grid.Column="0" Classes="indicator" Width="4" Height="20" VerticalAlignment="Center"/>
+                <Path Grid.Column="1" Classes="icon" Data="{StaticResource Icons.Stashes}"/>
+                <TextBlock Grid.Column="2" Classes="header" Text="{DynamicResource Text.Stashes}"/>
+                <Border Grid.Column="3"
                         Height="18"
                         Margin="6,0" Padding="9,0"
                         CornerRadius="9"
@@ -154,7 +160,7 @@
                              FontFamily="{DynamicResource Fonts.Monospace}"
                              FontSize="10"/>
                 </Border>
-                <Button Grid.Column="3"
+                <Button Grid.Column="4"
                         Classes="icon_button"
                         Width="26" Height="26"
                         Command="{Binding ClearStashes}"

From 1e2552996356adb03b11df9e7cb64c7cf5db02e6 Mon Sep 17 00:00:00 2001
From: JC-Chung <52159296+JC-Chung@users.noreply.github.com>
Date: Mon, 29 Jun 2026 16:04:35 +0800
Subject: [PATCH 02/42] fix: escape BRE special characters when selecting
 author from suggestions (#2494)

---
 src/App.Extensions.cs                 | 12 ++++++++++++
 src/ViewModels/SearchCommitContext.cs | 17 +++++++++++++++--
 src/Views/Repository.axaml.cs         |  4 ++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/App.Extensions.cs b/src/App.Extensions.cs
index 7c2d0195a0..e6d8add253 100644
--- a/src/App.Extensions.cs
+++ b/src/App.Extensions.cs
@@ -18,6 +18,18 @@ public static string Escaped(this string value)
             return value.Replace("\"", "\\\"", StringComparison.Ordinal);
         }
 
+        public static string EscapeForBRE(this string value)
+        {
+            return value
+                .Replace("\\", "\\\\", StringComparison.Ordinal)
+                .Replace(".", "\\.", StringComparison.Ordinal)
+                .Replace("[", "\\[", StringComparison.Ordinal)
+                .Replace("*", "\\*", StringComparison.Ordinal)
+                .Replace("^", "\\^", StringComparison.Ordinal)
+                .Replace("$", "\\$", StringComparison.Ordinal)
+                .Replace("{", "\\{", StringComparison.Ordinal);
+        }
+
         public static string FormatFontNames(string input)
         {
             if (string.IsNullOrEmpty(input))
diff --git a/src/ViewModels/SearchCommitContext.cs b/src/ViewModels/SearchCommitContext.cs
index e67046a9c6..eec02d7fa5 100644
--- a/src/ViewModels/SearchCommitContext.cs
+++ b/src/ViewModels/SearchCommitContext.cs
@@ -27,6 +27,7 @@ public string Filter
             get => _filter;
             set
             {
+                _isLiteralFilter = false;
                 if (SetProperty(ref _filter, value))
                     UpdateSuggestions();
             }
@@ -82,6 +83,14 @@ public void ClearFilter()
             Results = null;
         }
 
+        public void SetLiteralFilter(string filter)
+        {
+            _isLiteralFilter = true;
+            _filter = filter;
+            OnPropertyChanged(nameof(Filter));
+            UpdateSuggestions();
+        }
+
         public void ClearSuggestions()
         {
             Suggestions = null;
@@ -109,6 +118,9 @@ public void StartSearch()
                 var result = new List<Models.Commit>();
                 var method = (Models.CommitSearchMethod)_method;
                 var repoPath = _repo.FullPath;
+                var filter = (_isLiteralFilter && method == Models.CommitSearchMethod.ByAuthor)
+                    ? _filter.EscapeForBRE()
+                    : _filter;
 
                 if (method == Models.CommitSearchMethod.BySHA)
                 {
@@ -131,7 +143,7 @@ public void StartSearch()
                 }
                 else if (_onlySearchCurrentBranch)
                 {
-                    result = await new Commands.QueryCommits(repoPath, _filter, method, true)
+                    result = await new Commands.QueryCommits(repoPath, filter, method, true)
                         .GetResultAsync()
                         .ConfigureAwait(false);
 
@@ -140,7 +152,7 @@ public void StartSearch()
                 }
                 else
                 {
-                    result = await new Commands.QueryCommits(repoPath, _filter, method, false)
+                    result = await new Commands.QueryCommits(repoPath, filter, method, false)
                         .GetResultAsync()
                         .ConfigureAwait(false);
 
@@ -290,6 +302,7 @@ private void UpdateSuggestions()
         private int _method = (int)Models.CommitSearchMethod.ByMessage;
         private string _filter = string.Empty;
         private bool _onlySearchCurrentBranch = false;
+        private bool _isLiteralFilter = false;
         private bool _isQuerying = false;
         private List<Models.Commit> _results = null;
         private Models.Commit _selected = null;
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 97e5444817..1fdbe3ddcf 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -328,7 +328,7 @@ private void OnSearchSuggestionBoxKeyDown(object _, KeyEventArgs e)
                 else if (selected is Models.User user)
                 {
                     var apply = user.ToString();
-                    repo.SearchCommitContext.Filter = apply;
+                    repo.SearchCommitContext.SetLiteralFilter(apply);
                     TxtSearchCommitsBox.CaretIndex = apply.Length;
                 }
 
@@ -351,7 +351,7 @@ private void OnSearchSuggestionTapped(object sender, TappedEventArgs e)
             else if (ctx is Models.User user)
             {
                 var apply = user.ToString();
-                repo.SearchCommitContext.Filter = apply;
+                repo.SearchCommitContext.SetLiteralFilter(apply);
                 TxtSearchCommitsBox.CaretIndex = apply.Length;
             }
 

From 70dec95441bebccb9fe3acfa01e72190a4fcfa83 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Jun 2026 16:13:50 +0800
Subject: [PATCH 03/42] code_review: PR #2494

Since `EscapeForBRE` is only used when selecting item in suggestion popup (and the
searching command runs immediately after it), directly call `EscapeForBRE` to generate
the searching filter

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/SearchCommitContext.cs | 17 ++---------------
 src/Views/Repository.axaml.cs         |  8 ++++----
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/ViewModels/SearchCommitContext.cs b/src/ViewModels/SearchCommitContext.cs
index eec02d7fa5..e67046a9c6 100644
--- a/src/ViewModels/SearchCommitContext.cs
+++ b/src/ViewModels/SearchCommitContext.cs
@@ -27,7 +27,6 @@ public string Filter
             get => _filter;
             set
             {
-                _isLiteralFilter = false;
                 if (SetProperty(ref _filter, value))
                     UpdateSuggestions();
             }
@@ -83,14 +82,6 @@ public void ClearFilter()
             Results = null;
         }
 
-        public void SetLiteralFilter(string filter)
-        {
-            _isLiteralFilter = true;
-            _filter = filter;
-            OnPropertyChanged(nameof(Filter));
-            UpdateSuggestions();
-        }
-
         public void ClearSuggestions()
         {
             Suggestions = null;
@@ -118,9 +109,6 @@ public void StartSearch()
                 var result = new List<Models.Commit>();
                 var method = (Models.CommitSearchMethod)_method;
                 var repoPath = _repo.FullPath;
-                var filter = (_isLiteralFilter && method == Models.CommitSearchMethod.ByAuthor)
-                    ? _filter.EscapeForBRE()
-                    : _filter;
 
                 if (method == Models.CommitSearchMethod.BySHA)
                 {
@@ -143,7 +131,7 @@ public void StartSearch()
                 }
                 else if (_onlySearchCurrentBranch)
                 {
-                    result = await new Commands.QueryCommits(repoPath, filter, method, true)
+                    result = await new Commands.QueryCommits(repoPath, _filter, method, true)
                         .GetResultAsync()
                         .ConfigureAwait(false);
 
@@ -152,7 +140,7 @@ public void StartSearch()
                 }
                 else
                 {
-                    result = await new Commands.QueryCommits(repoPath, filter, method, false)
+                    result = await new Commands.QueryCommits(repoPath, _filter, method, false)
                         .GetResultAsync()
                         .ConfigureAwait(false);
 
@@ -302,7 +290,6 @@ private void UpdateSuggestions()
         private int _method = (int)Models.CommitSearchMethod.ByMessage;
         private string _filter = string.Empty;
         private bool _onlySearchCurrentBranch = false;
-        private bool _isLiteralFilter = false;
         private bool _isQuerying = false;
         private List<Models.Commit> _results = null;
         private Models.Commit _selected = null;
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 1fdbe3ddcf..f5bac41d8d 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -327,8 +327,8 @@ private void OnSearchSuggestionBoxKeyDown(object _, KeyEventArgs e)
                 }
                 else if (selected is Models.User user)
                 {
-                    var apply = user.ToString();
-                    repo.SearchCommitContext.SetLiteralFilter(apply);
+                    var apply = user.ToString().EscapeForBRE();
+                    repo.SearchCommitContext.Filter = apply;
                     TxtSearchCommitsBox.CaretIndex = apply.Length;
                 }
 
@@ -350,8 +350,8 @@ private void OnSearchSuggestionTapped(object sender, TappedEventArgs e)
             }
             else if (ctx is Models.User user)
             {
-                var apply = user.ToString();
-                repo.SearchCommitContext.SetLiteralFilter(apply);
+                var apply = user.ToString().EscapeForBRE();
+                repo.SearchCommitContext.Filter = apply;
                 TxtSearchCommitsBox.CaretIndex = apply.Length;
             }
 

From 5d8a9342281eab4b74c1d71e9e7ed05119a79949 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Jun 2026 16:38:14 +0800
Subject: [PATCH 04/42] refactor: move recent commit messages from repository
 settings to ui-states

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/RepositorySettings.cs        | 25 ------------------------
 src/Models/RepositoryUIStates.cs        | 26 +++++++++++++++++++++++++
 src/ViewModels/WorkingCopy.cs           |  4 ++--
 src/Views/CommitMessageToolBox.axaml.cs |  4 ++--
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index fdad5a9903..506e6ded78 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -54,12 +54,6 @@ public AvaloniaList<CommitTemplate> CommitTemplates
             set;
         } = [];
 
-        public AvaloniaList<string> CommitMessages
-        {
-            get;
-            set;
-        } = [];
-
         public AvaloniaList<CustomAction> CustomActions
         {
             get;
@@ -122,25 +116,6 @@ public void Save()
             }
         }
 
-        public void PushCommitMessage(string message)
-        {
-            message = message.Trim().ReplaceLineEndings("\n");
-            var existIdx = CommitMessages.IndexOf(message);
-            if (existIdx == 0)
-                return;
-
-            if (existIdx > 0)
-            {
-                CommitMessages.Move(existIdx, 0);
-                return;
-            }
-
-            if (CommitMessages.Count > 9)
-                CommitMessages.RemoveRange(9, CommitMessages.Count - 9);
-
-            CommitMessages.Insert(0, message);
-        }
-
         public CustomAction AddNewCustomAction()
         {
             var act = new CustomAction() { Name = "Unnamed Action" };
diff --git a/src/Models/RepositoryUIStates.cs b/src/Models/RepositoryUIStates.cs
index acc607cf2a..93cb6fc09c 100644
--- a/src/Models/RepositoryUIStates.cs
+++ b/src/Models/RepositoryUIStates.cs
@@ -231,6 +231,12 @@ public AvaloniaList<HistoryFilter> HistoryFilters
             set;
         } = [];
 
+        public List<string> RecentCommitMessages
+        {
+            get;
+            set;
+        } = [];
+
         public static RepositoryUIStates Load(string gitDir)
         {
             var fileInfo = new FileInfo(Path.Combine(gitDir, "sourcegit.uistates"));
@@ -477,6 +483,26 @@ private void BuildHistoryParamsForExcluded(StringBuilder builder, string gitDir)
             builder.Append("--tags ");
         }
 
+        public void AddRecentCommitMessage(string message)
+        {
+            message = message.Trim().ReplaceLineEndings("\n");
+            var existIdx = RecentCommitMessages.IndexOf(message);
+            if (existIdx == 0)
+                return;
+
+            if (existIdx > 0)
+            {
+                RecentCommitMessages.RemoveAt(existIdx);
+                RecentCommitMessages.Insert(0, message);
+                return;
+            }
+
+            if (RecentCommitMessages.Count > 9)
+                RecentCommitMessages.RemoveRange(9, RecentCommitMessages.Count - 9);
+
+            RecentCommitMessages.Insert(0, message);
+        }
+
         private string _file = string.Empty;
     }
 }
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 389ba6d4aa..c4a4c6486f 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -574,7 +574,7 @@ public async Task ClearCommitMessageHistoryAsync()
         {
             var sure = await App.AskConfirmAsync(App.Text("WorkingCopy.ClearCommitHistories.Confirm"));
             if (sure)
-                _repo.Settings.CommitMessages.Clear();
+                _repo.UIStates.RecentCommitMessages.Clear();
         }
 
         public async Task CommitAsync(bool autoStage, bool autoPush)
@@ -627,7 +627,7 @@ public async Task CommitAsync(bool autoStage, bool autoPush)
 
             using var lockWatcher = _repo.LockWatcher();
             IsCommitting = true;
-            _repo.Settings.PushCommitMessage(_commitMessage);
+            _repo.UIStates.AddRecentCommitMessage(_commitMessage);
 
             if (autoStage && _unstaged.Count > 0)
                 await StageChangesAsync(_unstaged, null);
diff --git a/src/Views/CommitMessageToolBox.axaml.cs b/src/Views/CommitMessageToolBox.axaml.cs
index 71b3efd153..365a554ea1 100644
--- a/src/Views/CommitMessageToolBox.axaml.cs
+++ b/src/Views/CommitMessageToolBox.axaml.cs
@@ -584,7 +584,7 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
 
                 menu.Items.Add(new MenuItem() { Header = "-" });
 
-                var historiesCount = repo.Settings.CommitMessages.Count;
+                var historiesCount = repo.UIStates.RecentCommitMessages.Count;
                 if (historiesCount == 0)
                 {
                     menu.Items.Add(new MenuItem()
@@ -598,7 +598,7 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
                 {
                     for (int i = 0; i < historiesCount; i++)
                     {
-                        var dup = repo.Settings.CommitMessages[i].Trim();
+                        var dup = repo.UIStates.RecentCommitMessages[i].Trim();
                         var header = new TextBlock()
                         {
                             Text = dup.ReplaceLineEndings(" "),

From bdcf335ef3687d1a973d437e8e0276cc58950d21 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Jun 2026 20:19:05 +0800
Subject: [PATCH 05/42] refactor: reorder context menu items of selected branch

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/BranchTree.axaml.cs | 53 ++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/Views/BranchTree.axaml.cs b/src/Views/BranchTree.axaml.cs
index 1a2fadd26c..1c3cfdc3c8 100644
--- a/src/Views/BranchTree.axaml.cs
+++ b/src/Views/BranchTree.axaml.cs
@@ -753,6 +753,23 @@ private ContextMenu CreateContextMenuForLocalBranch(ViewModels.Repository repo,
                 menu.Items.Add(push);
                 menu.Items.Add(new MenuItem() { Header = "-" });
 
+                var type = repo.GetGitFlowType(branch);
+                if (type != Models.GitFlowBranchType.None)
+                {
+                    var finish = new MenuItem();
+                    finish.Header = App.Text("BranchCM.Finish", branch.Name);
+                    finish.Icon = this.CreateMenuIcon("Icons.GitFlow.Finish");
+                    finish.IsEnabled = !repo.IsBare;
+                    finish.Click += (_, e) =>
+                    {
+                        if (repo.CanCreatePopup())
+                            repo.ShowPopup(new ViewModels.GitFlowFinish(repo, branch, type));
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(finish);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                }
+
                 if (upstream != null)
                 {
                     var compareWithUpstream = new MenuItem();
@@ -858,6 +875,23 @@ private ContextMenu CreateContextMenuForLocalBranch(ViewModels.Repository repo,
                     menu.Items.Add(rebase);
                     menu.Items.Add(new MenuItem() { Header = "-" });
                     menu.Items.Add(interactiveRebase);
+
+                    var type = repo.GetGitFlowType(branch);
+                    if (type != Models.GitFlowBranchType.None)
+                    {
+                        var finish = new MenuItem();
+                        finish.Header = App.Text("BranchCM.Finish", branch.Name);
+                        finish.Icon = this.CreateMenuIcon("Icons.GitFlow.Finish");
+                        finish.IsEnabled = !repo.IsBare || !hasNoWorktree;
+                        finish.Click += (_, e) =>
+                        {
+                            if (repo.CanCreatePopup())
+                                repo.ShowPopup(new ViewModels.GitFlowFinish(repo, branch, type));
+                            e.Handled = true;
+                        };
+                        menu.Items.Add(new MenuItem() { Header = "-" });
+                        menu.Items.Add(finish);
+                    }
                 }
 
                 if (hasNoWorktree)
@@ -912,25 +946,6 @@ private ContextMenu CreateContextMenuForLocalBranch(ViewModels.Repository repo,
                 menu.Items.Add(compareWith);
             }
 
-            if (!repo.IsBare)
-            {
-                var type = repo.GetGitFlowType(branch);
-                if (type != Models.GitFlowBranchType.None)
-                {
-                    var finish = new MenuItem();
-                    finish.Header = App.Text("BranchCM.Finish", branch.Name);
-                    finish.Icon = this.CreateMenuIcon("Icons.GitFlow.Finish");
-                    finish.Click += (_, e) =>
-                    {
-                        if (repo.CanCreatePopup())
-                            repo.ShowPopup(new ViewModels.GitFlowFinish(repo, branch, type));
-                        e.Handled = true;
-                    };
-                    menu.Items.Add(new MenuItem() { Header = "-" });
-                    menu.Items.Add(finish);
-                }
-            }
-
             if (!branch.IsDetachedHead)
             {
                 var editDescription = new MenuItem();

From 190b4d9734d91eb8a1dce689e8f543a08cf1703d Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Tue, 30 Jun 2026 10:24:53 +0800
Subject: [PATCH 06/42] fix: let the diff view wake up before its first curtain
 call (#2496)

Double-tapping a change in the Info tab raced against the tab switch:
the view poked the TabControl directly while SelectedChanges was still
clearing DiffContext to null, so the right-hand AvaloniaEdit rendered
blank until a later file switch rebuilt it.

Drive the switch through the ViewModel instead -- set SelectedChanges
first, then ActiveTabIndex, and raise OnPropertyChanged so the existing
DiffContext compensation in the setter reliably fires before the Changes
tab materializes.
---
 src/ViewModels/CommitDetail.cs  | 1 +
 src/Views/CommitDetail.axaml.cs | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 5d543b65c2..442f57033e 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -40,6 +40,7 @@ public int ActiveTabIndex
                 if (value != _sharedData.ActiveTabIndex)
                 {
                     _sharedData.ActiveTabIndex = value;
+                    OnPropertyChanged(nameof(ActiveTabIndex));
 
                     if (value == 1 && DiffContext == null && _selectedChanges is { Count: 1 })
                         DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_commit, _selectedChanges[0]));
diff --git a/src/Views/CommitDetail.axaml.cs b/src/Views/CommitDetail.axaml.cs
index f1640b4432..91bada7281 100644
--- a/src/Views/CommitDetail.axaml.cs
+++ b/src/Views/CommitDetail.axaml.cs
@@ -6,7 +6,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.LogicalTree;
 using Avalonia.Platform.Storage;
 using Avalonia.VisualTree;
 
@@ -532,11 +531,8 @@ private void OnChangeDoubleTapped(object sender, TappedEventArgs e)
         {
             if (DataContext is ViewModels.CommitDetail detail && sender is Grid { DataContext: Models.Change change })
             {
-                var tabControl = this.FindLogicalDescendantOfType<TabControl>();
-                if (tabControl != null)
-                    tabControl.SelectedIndex = 1;
-
                 detail.SelectedChanges = new() { change };
+                detail.ActiveTabIndex = 1;
             }
 
             e.Handled = true;

From e6b96d9806e0b8139e255b365dec0ea256120508 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 30 Jun 2026 23:11:36 +0800
Subject: [PATCH 07/42] fix: versions of `git` prior to v2.45.0 will reject a
 value of `commentChar` that consists of more than a single ASCII byte (#2500)

---
 src/Commands/InteractiveRebase.cs    | 2 +-
 src/Commands/Rebase.cs               | 2 +-
 src/ViewModels/InProgressContexts.cs | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Commands/InteractiveRebase.cs b/src/Commands/InteractiveRebase.cs
index f3c84c3d6c..6b61b9d2ab 100644
--- a/src/Commands/InteractiveRebase.cs
+++ b/src/Commands/InteractiveRebase.cs
@@ -11,7 +11,7 @@ public InteractiveRebase(string repo, string basedOn, bool autoStash, bool noVer
             Editor = EditorType.RebaseEditor;
 
             var builder = new StringBuilder(512);
-            builder.Append("-c core.commentChar=± rebase -i --autosquash ");
+            builder.Append("-c core.commentChar=\"^\" -c core.commentString=\"±\" rebase -i --autosquash ");
             if (autoStash)
                 builder.Append("--autostash ");
             if (noVerify)
diff --git a/src/Commands/Rebase.cs b/src/Commands/Rebase.cs
index 33b45413b2..fdc585c019 100644
--- a/src/Commands/Rebase.cs
+++ b/src/Commands/Rebase.cs
@@ -10,7 +10,7 @@ public Rebase(string repo, string basedOn, bool autoStash, bool noVerify)
             Context = repo;
 
             var builder = new StringBuilder(512);
-            builder.Append("-c core.commentChar=± rebase ");
+            builder.Append("-c core.commentChar=\"^\" -c core.commentString=\"±\" rebase ");
             if (autoStash)
                 builder.Append("--autostash ");
             if (noVerify)
diff --git a/src/ViewModels/InProgressContexts.cs b/src/ViewModels/InProgressContexts.cs
index 9a0e0cad82..97699eeab9 100644
--- a/src/ViewModels/InProgressContexts.cs
+++ b/src/ViewModels/InProgressContexts.cs
@@ -61,7 +61,7 @@ public CherryPickInProgress(Repository repo)
                 WorkingDirectory = repo.FullPath,
                 Context = repo.FullPath,
                 Editor = Commands.Command.EditorType.None,
-                Args = "-c core.commentChar=± cherry-pick --continue",
+                Args = "-c core.commentChar=\"^\" -c core.commentString=\"±\" cherry-pick --continue",
             };
 
             _skipCmd = new Commands.Command
@@ -116,7 +116,7 @@ public RebaseInProgress(Repository repo)
                 WorkingDirectory = repo.FullPath,
                 Context = repo.FullPath,
                 Editor = Commands.Command.EditorType.RebaseEditor,
-                Args = "-c core.commentChar=± rebase --continue",
+                Args = "-c core.commentChar=\"^\" -c core.commentString=\"±\" rebase --continue",
             };
 
             _skipCmd = new Commands.Command
@@ -187,7 +187,7 @@ public RevertInProgress(Repository repo)
                 WorkingDirectory = repo.FullPath,
                 Context = repo.FullPath,
                 Editor = Commands.Command.EditorType.None,
-                Args = "-c core.commentChar=± revert --continue",
+                Args = "-c core.commentChar=\"^\" -c core.commentString=\"±\" revert --continue",
             };
 
             _skipCmd = new Commands.Command
@@ -235,7 +235,7 @@ public MergeInProgress(Repository repo)
                 WorkingDirectory = repo.FullPath,
                 Context = repo.FullPath,
                 Editor = Commands.Command.EditorType.None,
-                Args = "-c core.commentChar=± merge --continue",
+                Args = "-c core.commentChar=\"^\" -c core.commentString=\"±\" merge --continue",
             };
 
             _abortCmd = new Commands.Command

From fe99f4a2109a4f81d762724e815fb78e945b0fbf Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 1 Jul 2026 11:19:57 +0800
Subject: [PATCH 08/42] ux: max height of group list in `Move Repository Node`
 popup (#2502)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/MoveRepositoryNode.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/MoveRepositoryNode.axaml b/src/Views/MoveRepositoryNode.axaml
index a4fe886d21..7c459de56a 100644
--- a/src/Views/MoveRepositoryNode.axaml
+++ b/src/Views/MoveRepositoryNode.axaml
@@ -27,7 +27,7 @@
              Margin="4,0"
              Padding="4"
              MinHeight="28"
-             MaxHeight="100"
+             MaxHeight="400"
              Focusable="True"
              BorderThickness="1"
              BorderBrush="{DynamicResource Brush.Border2}"

From b4201ed92372d5dc66a0e63f6eeb728ba463f884 Mon Sep 17 00:00:00 2001
From: JC-Chung <52159296+JC-Chung@users.noreply.github.com>
Date: Wed, 1 Jul 2026 11:24:21 +0800
Subject: [PATCH 09/42] fix: null check for RevisionFileSearchSuggestion on key
 down (#2501)

---
 src/Views/RevisionFiles.axaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/RevisionFiles.axaml.cs b/src/Views/RevisionFiles.axaml.cs
index fabe952f3d..aa274f1d9d 100644
--- a/src/Views/RevisionFiles.axaml.cs
+++ b/src/Views/RevisionFiles.axaml.cs
@@ -29,7 +29,7 @@ private async void OnSearchBoxKeyDown(object _, KeyEventArgs e)
             }
             else if (e.Key == Key.Down || e.Key == Key.Up)
             {
-                if (vm.RevisionFileSearchSuggestion.Count > 0)
+                if (vm.RevisionFileSearchSuggestion?.Count > 0)
                 {
                     SearchSuggestionBox.Focus(NavigationMethod.Tab);
                     SearchSuggestionBox.SelectedIndex = 0;

From bb9a3603d255741e83d3160f432805b2757068b8 Mon Sep 17 00:00:00 2001
From: JC-Chung <52159296+JC-Chung@users.noreply.github.com>
Date: Wed, 1 Jul 2026 14:02:07 +0800
Subject: [PATCH 10/42] fix: prevent crash in Chart.Render when repository has
 no commits (#2504)

---
 src/Views/Chart.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/Chart.cs b/src/Views/Chart.cs
index 6eafbd44dc..a6d196794d 100644
--- a/src/Views/Chart.cs
+++ b/src/Views/Chart.cs
@@ -54,7 +54,7 @@ public override void Render(DrawingContext context)
             base.Render(context);
 
             var samples = _samples;
-            if (samples == null || samples.Count == 0)
+            if (samples == null || samples.Count <= 0)
                 return;
 
             var w = Bounds.Width;

From f3fd2f6c26b93b36442d0c5348191b2e3a19b28b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 1 Jul 2026 16:27:17 +0800
Subject: [PATCH 11/42] refactor: do not render chart if no commit collected in
 statistics

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/Statistics.cs | 13 ++++++++-----
 src/Views/Chart.cs       |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Models/Statistics.cs b/src/Models/Statistics.cs
index 3ecee89e0e..4ef9927fc5 100644
--- a/src/Models/Statistics.cs
+++ b/src/Models/Statistics.cs
@@ -42,11 +42,14 @@ public StatisticsSamples(StatisticsMode mode, DateTime start, DateTime end, Dict
             else
                 MaxValue = (int)(Math.Floor(maxValue / 6.0) * 8.0);
 
-            Count = mode switch
-            {
-                StatisticsMode.All => (end.Year - start.Year) * 12 + (end.Month - start.Month) + 1,
-                _ => all.Count,
-            };
+            if (maxValue == 0)
+                Count = 0;
+            else
+                Count = mode switch
+                {
+                    StatisticsMode.All => (end.Year - start.Year) * 12 + (end.Month - start.Month) + 1,
+                    _ => all.Count,
+                };
         }
 
         public void WithUser(Dictionary<DateTime, int> user)
diff --git a/src/Views/Chart.cs b/src/Views/Chart.cs
index a6d196794d..6eafbd44dc 100644
--- a/src/Views/Chart.cs
+++ b/src/Views/Chart.cs
@@ -54,7 +54,7 @@ public override void Render(DrawingContext context)
             base.Render(context);
 
             var samples = _samples;
-            if (samples == null || samples.Count <= 0)
+            if (samples == null || samples.Count == 0)
                 return;
 
             var w = Bounds.Width;

From dd163e553750aca2908beb52008b5d9599d33d82 Mon Sep 17 00:00:00 2001
From: JC-Chung <52159296+JC-Chung@users.noreply.github.com>
Date: Wed, 1 Jul 2026 16:46:38 +0800
Subject: [PATCH 12/42] fix: hide file manager and terminal options for invalid
 repositories (#2503)

---
 src/ViewModels/RepositoryNode.cs     |  4 +--
 src/Views/RepositoryToolbar.axaml.cs |  4 +++
 src/Views/Welcome.axaml.cs           | 45 +++++++++++++++-------------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs
index 491b533462..a8969123cb 100644
--- a/src/ViewModels/RepositoryNode.cs
+++ b/src/ViewModels/RepositoryNode.cs
@@ -125,14 +125,14 @@ public void Move()
 
         public void OpenInFileManager()
         {
-            if (!IsRepository)
+            if (!IsRepository || IsInvalid)
                 return;
             Native.OS.OpenInFileManager(_id);
         }
 
         public void OpenTerminal()
         {
-            if (!IsRepository)
+            if (!IsRepository || IsInvalid)
                 return;
             Native.OS.OpenTerminal(_id);
         }
diff --git a/src/Views/RepositoryToolbar.axaml.cs b/src/Views/RepositoryToolbar.axaml.cs
index fd37a6f266..e8cab42578 100644
--- a/src/Views/RepositoryToolbar.axaml.cs
+++ b/src/Views/RepositoryToolbar.axaml.cs
@@ -21,6 +21,10 @@ private void OpenWithExternalTools(object sender, RoutedEventArgs ev)
             if (sender is Button button && DataContext is ViewModels.Repository repo)
             {
                 var fullpath = repo.FullPath;
+
+                if (!System.IO.Directory.Exists(fullpath))
+                    return;
+
                 var menu = new ContextMenu();
                 menu.Placement = PlacementMode.BottomEdgeAlignedLeft;
 
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index 830b881c24..f0f54d21ee 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -174,29 +174,32 @@ private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs
                         e.Handled = true;
                     };
 
-                    var explore = new MenuItem();
-                    explore.Header = App.Text("Repository.Explore");
-                    explore.Icon = this.CreateMenuIcon("Icons.Explore");
-                    explore.Click += (_, e) =>
-                    {
-                        node.OpenInFileManager();
-                        e.Handled = true;
-                    };
-
-                    var terminal = new MenuItem();
-                    terminal.Header = App.Text("Repository.Terminal");
-                    terminal.Icon = this.CreateMenuIcon("Icons.Terminal");
-                    terminal.Click += (_, e) =>
-                    {
-                        node.OpenTerminal();
-                        e.Handled = true;
-                    };
-
                     menu.Items.Add(open);
                     menu.Items.Add(new MenuItem() { Header = "-" });
-                    menu.Items.Add(explore);
-                    menu.Items.Add(terminal);
-                    menu.Items.Add(new MenuItem() { Header = "-" });
+
+                    if (!node.IsInvalid)
+                    {
+                        var explore = new MenuItem();
+                        explore.Header = App.Text("Repository.Explore");
+                        explore.Icon = this.CreateMenuIcon("Icons.Explore");
+                        explore.Click += (_, e) =>
+                        {
+                            node.OpenInFileManager();
+                            e.Handled = true;
+                        };
+
+                        var terminal = new MenuItem();
+                        terminal.Header = App.Text("Repository.Terminal");
+                        terminal.Icon = this.CreateMenuIcon("Icons.Terminal");
+                        terminal.Click += (_, e) =>
+                        {
+                            node.OpenTerminal();
+                            e.Handled = true;
+                        };
+                        menu.Items.Add(explore);
+                        menu.Items.Add(terminal);
+                        menu.Items.Add(new MenuItem() { Header = "-" });
+                    }
                 }
                 else
                 {

From cb1664f1e5db313606319450c6a239205380cb06 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 1 Jul 2026 17:03:25 +0800
Subject: [PATCH 13/42] code_review: PR #2503

- Use `Directory.Exists(_id)` instead of `IsInvalid` since we have alread makes sure it's a repository
- For invalid repository node, only show `Delete` entry in context menu

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/RepositoryNode.cs     |  21 ++--
 src/Views/RepositoryToolbar.axaml.cs |   4 +-
 src/Views/Welcome.axaml.cs           | 148 ++++++++++++++-------------
 3 files changed, 90 insertions(+), 83 deletions(-)

diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs
index a8969123cb..9d7ab9debc 100644
--- a/src/ViewModels/RepositoryNode.cs
+++ b/src/ViewModels/RepositoryNode.cs
@@ -92,14 +92,15 @@ public List<RepositoryNode> SubNodes
 
         public void Open()
         {
-            if (IsRepository)
+            if (!_isRepository)
+            {
+                foreach (var subNode in SubNodes)
+                    subNode.Open();
+            }
+            else if (Directory.Exists(_id))
             {
                 App.GetLauncher().OpenRepositoryInTab(this, null);
-                return;
             }
-
-            foreach (var subNode in SubNodes)
-                subNode.Open();
         }
 
         public void Edit()
@@ -125,16 +126,14 @@ public void Move()
 
         public void OpenInFileManager()
         {
-            if (!IsRepository || IsInvalid)
-                return;
-            Native.OS.OpenInFileManager(_id);
+            if (_isRepository && Directory.Exists(_id))
+                Native.OS.OpenInFileManager(_id);
         }
 
         public void OpenTerminal()
         {
-            if (!IsRepository || IsInvalid)
-                return;
-            Native.OS.OpenTerminal(_id);
+            if (_isRepository && Directory.Exists(_id))
+                Native.OS.OpenTerminal(_id);
         }
 
         public void Delete()
diff --git a/src/Views/RepositoryToolbar.axaml.cs b/src/Views/RepositoryToolbar.axaml.cs
index e8cab42578..9172e0829f 100644
--- a/src/Views/RepositoryToolbar.axaml.cs
+++ b/src/Views/RepositoryToolbar.axaml.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -21,8 +22,7 @@ private void OpenWithExternalTools(object sender, RoutedEventArgs ev)
             if (sender is Button button && DataContext is ViewModels.Repository repo)
             {
                 var fullpath = repo.FullPath;
-
-                if (!System.IO.Directory.Exists(fullpath))
+                if (!Directory.Exists(fullpath))
                     return;
 
                 var menu = new ContextMenu();
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index f0f54d21ee..c93c27ebb8 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -1,5 +1,7 @@
 using System;
+using System.IO;
 using System.Threading;
+
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -148,72 +150,6 @@ private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs
             {
                 var menu = new ContextMenu();
 
-                if (!node.IsRepository && node.SubNodes.Count > 0)
-                {
-                    var openAll = new MenuItem();
-                    openAll.Header = App.Text("Welcome.OpenAllInNode");
-                    openAll.Icon = this.CreateMenuIcon("Icons.Folder.Open");
-                    openAll.Click += (_, e) =>
-                    {
-                        node.Open();
-                        e.Handled = true;
-                    };
-
-                    menu.Items.Add(openAll);
-                    menu.Items.Add(new MenuItem() { Header = "-" });
-                }
-
-                if (node.IsRepository)
-                {
-                    var open = new MenuItem();
-                    open.Header = App.Text("Welcome.OpenOrInit");
-                    open.Icon = this.CreateMenuIcon("Icons.Folder.Open");
-                    open.Click += (_, e) =>
-                    {
-                        node.Open();
-                        e.Handled = true;
-                    };
-
-                    menu.Items.Add(open);
-                    menu.Items.Add(new MenuItem() { Header = "-" });
-
-                    if (!node.IsInvalid)
-                    {
-                        var explore = new MenuItem();
-                        explore.Header = App.Text("Repository.Explore");
-                        explore.Icon = this.CreateMenuIcon("Icons.Explore");
-                        explore.Click += (_, e) =>
-                        {
-                            node.OpenInFileManager();
-                            e.Handled = true;
-                        };
-
-                        var terminal = new MenuItem();
-                        terminal.Header = App.Text("Repository.Terminal");
-                        terminal.Icon = this.CreateMenuIcon("Icons.Terminal");
-                        terminal.Click += (_, e) =>
-                        {
-                            node.OpenTerminal();
-                            e.Handled = true;
-                        };
-                        menu.Items.Add(explore);
-                        menu.Items.Add(terminal);
-                        menu.Items.Add(new MenuItem() { Header = "-" });
-                    }
-                }
-                else
-                {
-                    var addSubFolder = new MenuItem();
-                    addSubFolder.Header = App.Text("Welcome.AddSubFolder");
-                    addSubFolder.Icon = this.CreateMenuIcon("Icons.Folder.Add");
-                    addSubFolder.Click += (_, e) =>
-                    {
-                        node.AddSubFolder();
-                        e.Handled = true;
-                    };
-                    menu.Items.Add(addSubFolder);
-                }
-
                 var edit = new MenuItem();
                 edit.Header = App.Text("Welcome.Edit");
                 edit.Icon = this.CreateMenuIcon("Icons.Edit");
@@ -241,10 +177,82 @@ private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs
                     e.Handled = true;
                 };
 
-                menu.Items.Add(edit);
-                menu.Items.Add(move);
-                menu.Items.Add(new MenuItem() { Header = "-" });
-                menu.Items.Add(delete);
+                if (!node.IsRepository)
+                {
+                    if (node.SubNodes.Count > 0)
+                    {
+                        var openAll = new MenuItem();
+                        openAll.Header = App.Text("Welcome.OpenAllInNode");
+                        openAll.Icon = this.CreateMenuIcon("Icons.Folder.Open");
+                        openAll.Click += (_, e) =>
+                        {
+                            node.Open();
+                            e.Handled = true;
+                        };
+
+                        menu.Items.Add(openAll);
+                        menu.Items.Add(new MenuItem() { Header = "-" });
+                    }
+
+                    var addSubFolder = new MenuItem();
+                    addSubFolder.Header = App.Text("Welcome.AddSubFolder");
+                    addSubFolder.Icon = this.CreateMenuIcon("Icons.Folder.Add");
+                    addSubFolder.Click += (_, e) =>
+                    {
+                        node.AddSubFolder();
+                        e.Handled = true;
+                    };
+
+                    menu.Items.Add(addSubFolder);
+                    menu.Items.Add(edit);
+                    menu.Items.Add(move);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(delete);
+                }
+                else if (Directory.Exists(node.Id))
+                {
+                    var open = new MenuItem();
+                    open.Header = App.Text("Welcome.OpenOrInit");
+                    open.Icon = this.CreateMenuIcon("Icons.Folder.Open");
+                    open.Click += (_, e) =>
+                    {
+                        node.Open();
+                        e.Handled = true;
+                    };
+
+                    var explore = new MenuItem();
+                    explore.Header = App.Text("Repository.Explore");
+                    explore.Icon = this.CreateMenuIcon("Icons.Explore");
+                    explore.Click += (_, e) =>
+                    {
+                        node.OpenInFileManager();
+                        e.Handled = true;
+                    };
+
+                    var terminal = new MenuItem();
+                    terminal.Header = App.Text("Repository.Terminal");
+                    terminal.Icon = this.CreateMenuIcon("Icons.Terminal");
+                    terminal.Click += (_, e) =>
+                    {
+                        node.OpenTerminal();
+                        e.Handled = true;
+                    };
+
+                    menu.Items.Add(open);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(explore);
+                    menu.Items.Add(terminal);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(edit);
+                    menu.Items.Add(move);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(delete);
+                }
+                else
+                {
+                    menu.Items.Add(delete);
+                }
+
                 menu.Open(grid);
             }
 

From 80ca73531e503607d0132729f472372afab433fe Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 1 Jul 2026 17:07:50 +0800
Subject: [PATCH 14/42] ux: default select the `ROOT` group in `Move Repository
 Node` popup (#2502)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/MoveRepositoryNode.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ViewModels/MoveRepositoryNode.cs b/src/ViewModels/MoveRepositoryNode.cs
index 0c213058bd..716274295f 100644
--- a/src/ViewModels/MoveRepositoryNode.cs
+++ b/src/ViewModels/MoveRepositoryNode.cs
@@ -32,6 +32,7 @@ public MoveRepositoryNode(RepositoryNode target)
                 Id = Guid.NewGuid().ToString()
             });
             MakeRows(Preferences.Instance.RepositoryNodes, 1);
+            Selected = Rows[0];
         }
 
         public override Task<bool> Sure()

From 324e4af098ea8028d5d16f322bc5429fde08bd24 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 1 Jul 2026 17:36:55 +0800
Subject: [PATCH 15/42] refactor: change the `Open Local Repository` hotkey to
 `Ctrl+L` on Windows/Linux

- Add missing hotkey tooltips
- Because on Windows/Linux (WSL), the hotkey `Ctrl+Shift+O` will be parsed as `Key.ImeProcessed`,
   change the hotkey to open local repository to `Ctrl+L`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Hotkeys.axaml              |  2 +-
 src/Views/Launcher.axaml.cs          | 37 +++++++++++++++-------------
 src/Views/RepositoryToolbar.axaml.cs |  4 +++
 src/Views/WelcomeToolbar.axaml       | 11 +++++++--
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 7d72c0aa53..5412f5c7e7 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -64,7 +64,7 @@
           <TextBlock Grid.Row="5" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+N, macOS=⌘+N}"/>
           <TextBlock Grid.Row="5" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.Clone}" />
 
-          <TextBlock Grid.Row="6" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Shift+O, macOS=⌘+⇧+O}"/>
+          <TextBlock Grid.Row="6" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+L, macOS=⌘+⇧+O}"/>
           <TextBlock Grid.Row="6" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.OpenLocalRepository}" />
 
           <TextBlock Grid.Row="7" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Alt+P, macOS=⌘+⌥+P}"/>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 9905b4f5b8..80d53438ba 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -143,7 +143,9 @@ protected override async void OnKeyDown(KeyEventArgs e)
             }
 
             // Register hotkeys for Windows/Linux (macOS has registered these keys in system menu bar)
-            if (!OperatingSystem.IsMacOS())
+            var isMacOS = OperatingSystem.IsMacOS();
+            var cmdKey = isMacOS ? KeyModifiers.Meta : KeyModifiers.Control;
+            if (!isMacOS)
             {
                 if (e is { KeyModifiers: KeyModifiers.Control, Key: Key.OemComma })
                 {
@@ -178,8 +180,6 @@ protected override async void OnKeyDown(KeyEventArgs e)
                 return;
             }
 
-            var cmdKey = OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control;
-
             if (vm.CommandPalette != null)
             {
                 if (e.Key == Key.Escape)
@@ -199,6 +199,19 @@ protected override async void OnKeyDown(KeyEventArgs e)
                 return;
             }
 
+            // macOS: Cmd+Shift+O to open local repository, Windows/Linux: Ctrl+L to open local repository.
+            // It's because that Ctrl+Shift+O doesn't work on Windows/Linux(WSL). The e.Key is parsed as Key.ImeProcessed...
+            if ((isMacOS && e is { Key: Key.O, KeyModifiers: KeyModifiers.Meta | KeyModifiers.Shift }) ||
+                (!isMacOS && e is { Key: Key.L, KeyModifiers: KeyModifiers.Control }))
+            {
+                if (vm.ActivePage.Data is not ViewModels.Welcome)
+                    vm.AddNewTab();
+
+                ViewModels.Welcome.Instance.OpenLocalRepository();
+                e.Handled = true;
+                return;
+            }
+
             if (e.KeyModifiers.HasFlag(cmdKey))
             {
                 if (e.Key == Key.W)
@@ -218,16 +231,6 @@ protected override async void OnKeyDown(KeyEventArgs e)
                     return;
                 }
 
-                if (e.Key == Key.O && e.KeyModifiers.HasFlag(KeyModifiers.Shift))
-                {
-                    if (vm.ActivePage.Data is not ViewModels.Welcome)
-                        vm.AddNewTab();
-
-                    ViewModels.Welcome.Instance.OpenLocalRepository();
-                    e.Handled = true;
-                    return;
-                }
-
                 if (e.Key == Key.T && e.KeyModifiers == cmdKey)
                 {
                     vm.AddNewTab();
@@ -235,16 +238,16 @@ protected override async void OnKeyDown(KeyEventArgs e)
                     return;
                 }
 
-                if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) ||
-                    (!OperatingSystem.IsMacOS() && !e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
+                if ((isMacOS && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) ||
+                    (!isMacOS && !e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
                 {
                     vm.GotoNextTab();
                     e.Handled = true;
                     return;
                 }
 
-                if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Left) ||
-                    (!OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
+                if ((isMacOS && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Left) ||
+                    (!isMacOS && e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
                 {
                     vm.GotoPrevTab();
                     e.Handled = true;
diff --git a/src/Views/RepositoryToolbar.axaml.cs b/src/Views/RepositoryToolbar.axaml.cs
index 9172e0829f..0d03acb89b 100644
--- a/src/Views/RepositoryToolbar.axaml.cs
+++ b/src/Views/RepositoryToolbar.axaml.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 
@@ -25,6 +26,7 @@ private void OpenWithExternalTools(object sender, RoutedEventArgs ev)
                 if (!Directory.Exists(fullpath))
                     return;
 
+                var isMacOS = OperatingSystem.IsMacOS();
                 var menu = new ContextMenu();
                 menu.Placement = PlacementMode.BottomEdgeAlignedLeft;
 
@@ -35,6 +37,7 @@ private void OpenWithExternalTools(object sender, RoutedEventArgs ev)
                 var explore = new MenuItem();
                 explore.Header = App.Text("Repository.Explore");
                 explore.Icon = this.CreateMenuIcon("Icons.Explore");
+                explore.Tag = isMacOS ? "⌘+E" : "Ctrl+E";
                 explore.Click += (_, e) =>
                 {
                     Native.OS.OpenInFileManager(fullpath);
@@ -44,6 +47,7 @@ private void OpenWithExternalTools(object sender, RoutedEventArgs ev)
                 var terminal = new MenuItem();
                 terminal.Header = App.Text("Repository.Terminal");
                 terminal.Icon = this.CreateMenuIcon("Icons.Terminal");
+                terminal.Tag = isMacOS ? "Λ+`" : "Ctrl+`";
                 terminal.Click += (_, e) =>
                 {
                     Native.OS.OpenTerminal(fullpath);
diff --git a/src/Views/WelcomeToolbar.axaml b/src/Views/WelcomeToolbar.axaml
index 91f2064fa7..86f8de2075 100644
--- a/src/Views/WelcomeToolbar.axaml
+++ b/src/Views/WelcomeToolbar.axaml
@@ -24,13 +24,20 @@
           <TextBlock>
             <Run Text="{DynamicResource Text.Welcome.OpenOrInit}"/>
             <Run Text=" "/>
-            <Run Text="{OnPlatform Ctrl+Shift+O, macOS=⌘+⇧+O}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
+            <Run Text="{OnPlatform Ctrl+L, macOS=⌘+⇧+O}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
           </TextBlock>
         </ToolTip.Tip>
         <Path Width="14" Height="14" Data="{StaticResource Icons.Folder.Open}" Margin="0,2,0,0"/>
       </Button>
 
-      <Button Classes="icon_button" Width="32" Command="{Binding OpenTerminal}" ToolTip.Tip="{DynamicResource Text.Welcome.OpenTerminal}">
+      <Button Classes="icon_button" Width="32" Command="{Binding OpenTerminal}">
+        <ToolTip.Tip>
+          <TextBlock>
+            <Run Text="{DynamicResource Text.Welcome.OpenTerminal}"/>
+            <Run Text=" "/>
+            <Run Text="{OnPlatform Ctrl+`, macOS=Λ+`}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
+          </TextBlock>
+        </ToolTip.Tip>
         <Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
       </Button>
     </StackPanel>

From 06e2fdc0e42352b7586d78f7f1385ee0e87caa29 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 2 Jul 2026 15:34:22 +0800
Subject: [PATCH 16/42] ux!: change the hotkeys to clone/open repository
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Hotkey to clone remote repository: `Ctrl+R`/`⌘+R` (R means remote)
- Hotkey to open local repository: `Ctrl+L`/`⌘+L` (L means local)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml |  2 +-
 src/Views/Hotkeys.axaml           |  4 ++--
 src/Views/Launcher.axaml.cs       | 25 +++++++++++--------------
 src/Views/WelcomeToolbar.axaml    |  4 ++--
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 33456d92a7..f23542dd2d 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -526,7 +526,7 @@
   <x:String x:Key="Text.HistoriesDetailsStandalone.RevisionCompare" xml:space="preserve">Revision Compare</x:String>
   <x:String x:Key="Text.Hotkeys" xml:space="preserve">Keyboard Shortcuts Reference</x:String>
   <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">GLOBAL</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.Clone" xml:space="preserve">Clone new repository</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.Clone" xml:space="preserve">Clone remote repository</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CloseTab" xml:space="preserve">Close current tab</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Go to next tab</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Go to previous tab</x:String>
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 5412f5c7e7..e2de7556b1 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -61,10 +61,10 @@
           <TextBlock Grid.Row="4" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Tab, macOS=⌘+⌥+→}"/>
           <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoNextTab}" />
 
-          <TextBlock Grid.Row="5" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+N, macOS=⌘+N}"/>
+          <TextBlock Grid.Row="5" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+R, macOS=⌘+R}"/>
           <TextBlock Grid.Row="5" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.Clone}" />
 
-          <TextBlock Grid.Row="6" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+L, macOS=⌘+⇧+O}"/>
+          <TextBlock Grid.Row="6" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+L, macOS=⌘+L}"/>
           <TextBlock Grid.Row="6" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.OpenLocalRepository}" />
 
           <TextBlock Grid.Row="7" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Alt+P, macOS=⌘+⌥+P}"/>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 80d53438ba..27b213c284 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -199,19 +199,6 @@ protected override async void OnKeyDown(KeyEventArgs e)
                 return;
             }
 
-            // macOS: Cmd+Shift+O to open local repository, Windows/Linux: Ctrl+L to open local repository.
-            // It's because that Ctrl+Shift+O doesn't work on Windows/Linux(WSL). The e.Key is parsed as Key.ImeProcessed...
-            if ((isMacOS && e is { Key: Key.O, KeyModifiers: KeyModifiers.Meta | KeyModifiers.Shift }) ||
-                (!isMacOS && e is { Key: Key.L, KeyModifiers: KeyModifiers.Control }))
-            {
-                if (vm.ActivePage.Data is not ViewModels.Welcome)
-                    vm.AddNewTab();
-
-                ViewModels.Welcome.Instance.OpenLocalRepository();
-                e.Handled = true;
-                return;
-            }
-
             if (e.KeyModifiers.HasFlag(cmdKey))
             {
                 if (e.Key == Key.W)
@@ -221,7 +208,7 @@ protected override async void OnKeyDown(KeyEventArgs e)
                     return;
                 }
 
-                if (e.Key == Key.N)
+                if (e.Key == Key.R)
                 {
                     if (vm.ActivePage.Data is not ViewModels.Welcome)
                         vm.AddNewTab();
@@ -231,6 +218,16 @@ protected override async void OnKeyDown(KeyEventArgs e)
                     return;
                 }
 
+                if (e.Key == Key.L)
+                {
+                    if (vm.ActivePage.Data is not ViewModels.Welcome)
+                        vm.AddNewTab();
+
+                    ViewModels.Welcome.Instance.OpenLocalRepository();
+                    e.Handled = true;
+                    return;
+                }
+
                 if (e.Key == Key.T && e.KeyModifiers == cmdKey)
                 {
                     vm.AddNewTab();
diff --git a/src/Views/WelcomeToolbar.axaml b/src/Views/WelcomeToolbar.axaml
index 86f8de2075..d26613e6cf 100644
--- a/src/Views/WelcomeToolbar.axaml
+++ b/src/Views/WelcomeToolbar.axaml
@@ -13,7 +13,7 @@
           <TextBlock>
             <Run Text="{DynamicResource Text.Welcome.Clone}"/>
             <Run Text=" "/>
-            <Run Text="{OnPlatform Ctrl+N, macOS=⌘+N}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
+            <Run Text="{OnPlatform Ctrl+R, macOS=⌘+R}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
           </TextBlock>
         </ToolTip.Tip>
         <Path Width="16" Height="16" Data="{StaticResource Icons.Clone}" Margin="0,4,0,0"/>
@@ -24,7 +24,7 @@
           <TextBlock>
             <Run Text="{DynamicResource Text.Welcome.OpenOrInit}"/>
             <Run Text=" "/>
-            <Run Text="{OnPlatform Ctrl+L, macOS=⌘+⇧+O}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
+            <Run Text="{OnPlatform Ctrl+L, macOS=⌘+L}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
           </TextBlock>
         </ToolTip.Tip>
         <Path Width="14" Height="14" Data="{StaticResource Icons.Folder.Open}" Margin="0,2,0,0"/>

From 4a8276f2922b0cc942b2b3687f5938cfa1e612d1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 2 Jul 2026 15:44:31 +0800
Subject: [PATCH 17/42] feature: add hotkey `Ctrl+N` to open commit details
 panel in a seperate window (#2506)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Histories.axaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 6aeb8c75cb..d807781a49 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -397,7 +397,17 @@
                 Padding="0"
                 IsVisible="{Binding IsOpenAsStandaloneVisible, Mode=OneWay}"
                 Click="OnOpenDetailsAsStandalone"
-                ToolTip.Tip="{DynamicResource Text.HistoriesDetailsStandalone}">
+                HotKey="{OnPlatform Ctrl+N, macOS=⌘+N}">
+          <ToolTip.Tip>
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+              <TextBlock Text="{DynamicResource Text.HistoriesDetailsStandalone}" VerticalAlignment="Center"/>
+              <TextBlock Margin="16,0,0,0"
+                         Text="{OnPlatform Ctrl+N, macOS=⌘+N}"
+                         Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                         FontSize="11"
+                         VerticalAlignment="Center"/>
+            </StackPanel>
+          </ToolTip.Tip>
           <Path Width="15" Height="15" Margin="0,1,0,0" Data="{StaticResource Icons.OpenAsStandalone}"/>
         </Button>
         

From 34f4a7c6f284d7b46cb72cbcda23ab2477675e8b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 2 Jul 2026 16:05:48 +0800
Subject: [PATCH 18/42] refactor: use `*` instead `*.*` to choose file without
 specified extensions (#2467)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/AddRemote.axaml.cs           | 2 +-
 src/Views/Clone.axaml.cs               | 2 +-
 src/Views/EditRemote.axaml.cs          | 7 ++++++-
 src/Views/ExecuteCustomAction.axaml.cs | 2 +-
 src/Views/Preferences.axaml.cs         | 2 +-
 src/Views/RepositoryConfigure.axaml.cs | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Views/AddRemote.axaml.cs b/src/Views/AddRemote.axaml.cs
index 4c3914f257..3fb283eaaf 100644
--- a/src/Views/AddRemote.axaml.cs
+++ b/src/Views/AddRemote.axaml.cs
@@ -20,7 +20,7 @@ private async void SelectSSHKey(object _, RoutedEventArgs e)
             var options = new FilePickerOpenOptions()
             {
                 AllowMultiple = false,
-                FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }]
+                FileTypeFilter = [new("SSHKey") { Patterns = ["*"] }]
             };
 
             var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options);
diff --git a/src/Views/Clone.axaml.cs b/src/Views/Clone.axaml.cs
index 91e8c7ada4..440fcfe062 100644
--- a/src/Views/Clone.axaml.cs
+++ b/src/Views/Clone.axaml.cs
@@ -70,7 +70,7 @@ private async void SelectSSHKey(object _, RoutedEventArgs e)
             var options = new FilePickerOpenOptions()
             {
                 AllowMultiple = false,
-                FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }]
+                FileTypeFilter = [new("SSHKey") { Patterns = ["*"] }]
             };
 
             var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options);
diff --git a/src/Views/EditRemote.axaml.cs b/src/Views/EditRemote.axaml.cs
index 7d88704e53..655cbdcd2d 100644
--- a/src/Views/EditRemote.axaml.cs
+++ b/src/Views/EditRemote.axaml.cs
@@ -17,7 +17,12 @@ private async void SelectSSHKey(object _, RoutedEventArgs e)
             if (toplevel == null)
                 return;
 
-            var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }] };
+            var options = new FilePickerOpenOptions()
+            {
+                AllowMultiple = false,
+                FileTypeFilter = [new("SSHKey") { Patterns = ["*"] }]
+            };
+
             var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options);
             if (selected.Count == 1)
                 TxtSshKey.Text = selected[0].Path.LocalPath;
diff --git a/src/Views/ExecuteCustomAction.axaml.cs b/src/Views/ExecuteCustomAction.axaml.cs
index e3aadb39bc..5589101e0d 100644
--- a/src/Views/ExecuteCustomAction.axaml.cs
+++ b/src/Views/ExecuteCustomAction.axaml.cs
@@ -47,7 +47,7 @@ private async void SelectPath(object sender, RoutedEventArgs e)
                 var options = new FilePickerOpenOptions()
                 {
                     AllowMultiple = false,
-                    FileTypeFilter = [new FilePickerFileType("File") { Patterns = ["*.*"] }]
+                    FileTypeFilter = [new("SSHKey") { Patterns = ["*"] }]
                 };
 
                 var selected = await topLevel.StorageProvider.OpenFilePickerAsync(options);
diff --git a/src/Views/Preferences.axaml.cs b/src/Views/Preferences.axaml.cs
index aaa0f29170..99ec73a5f2 100644
--- a/src/Views/Preferences.axaml.cs
+++ b/src/Views/Preferences.axaml.cs
@@ -451,8 +451,8 @@ private async void SelectExecutableForCustomAction(object sender, RoutedEventArg
         {
             var options = new FilePickerOpenOptions()
             {
-                FileTypeFilter = [new FilePickerFileType("Executable file(script)") { Patterns = ["*.*"] }],
                 AllowMultiple = false,
+                FileTypeFilter = [new("Executable file(script)") { Patterns = ["*"] }]
             };
 
             try
diff --git a/src/Views/RepositoryConfigure.axaml.cs b/src/Views/RepositoryConfigure.axaml.cs
index bc445d2a70..b543d9edf0 100644
--- a/src/Views/RepositoryConfigure.axaml.cs
+++ b/src/Views/RepositoryConfigure.axaml.cs
@@ -40,8 +40,8 @@ private async void SelectExecutableForCustomAction(object sender, RoutedEventArg
         {
             var options = new FilePickerOpenOptions()
             {
-                FileTypeFilter = [new FilePickerFileType("Executable file(script)") { Patterns = ["*.*"] }],
                 AllowMultiple = false,
+                FileTypeFilter = [new("Executable file(script)") { Patterns = ["*"] }]
             };
 
             var selected = await StorageProvider.OpenFilePickerAsync(options);

From 49f6dd52d360818bb0544eb3cf6b1777057f379c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 3 Jul 2026 12:08:56 +0800
Subject: [PATCH 19/42] ux: style for search panel in text editor

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Styles.axaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 58bfceb7ec..4aaf3b23c3 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -1414,6 +1414,7 @@
           <Grid RowDefinitions="Auto,Auto">
             <StackPanel Grid.Row="0" Orientation="Horizontal">
               <TextBox Watermark="{x:Static ae:SR.SearchLabel}"
+                       BorderBrush="{DynamicResource Brush.Border2}"
                        Name="PART_searchTextBox"
                        Width="265" Height="28"
                        Margin="0,0,0,0"

From 9fea6653d0f20048ac98991b4767e9112a0fea9e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 3 Jul 2026 16:55:18 +0800
Subject: [PATCH 20/42] ux: dropdown menu position

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/CommitMessageToolBox.axaml.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Views/CommitMessageToolBox.axaml.cs b/src/Views/CommitMessageToolBox.axaml.cs
index 365a554ea1..238419d70b 100644
--- a/src/Views/CommitMessageToolBox.axaml.cs
+++ b/src/Views/CommitMessageToolBox.axaml.cs
@@ -640,6 +640,8 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
 
                 button.IsEnabled = false;
                 menu.Placement = PlacementMode.TopEdgeAlignedLeft;
+                menu.HorizontalOffset = -2;
+                menu.VerticalOffset = 1;
                 menu.Closed += (_, _) => button.IsEnabled = true;
                 menu.Open(button);
             }

From 2aeb335ff3df176b9bb8328251d935dc3849ec21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20J=2E=20Mart=C3=ADnez=20M=2E?=
 <56406225+jjesus-dev@users.noreply.github.com>
Date: Sat, 4 Jul 2026 19:31:41 -0600
Subject: [PATCH 21/42] localization: update Spanish translation (#2510)

+ Add missing strings.
+ Change old instaces of lines with text `untracked` to `sin rastrear` for consistency.
---
 src/Resources/Locales/es_ES.axaml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index e59e25e6ad..5f374f0934 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -346,7 +346,9 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Forzar desinicialización incluso si contiene cambios locales.</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Submódulo:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Eliminar Rama</x:String>
+  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">¿Quieres que también se elimine la siguiente rama remota?</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Rama:</x:String>
+  <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Forzar la eliminación incluso si contiene commit(s) sin fusionar</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">¡Estás a punto de eliminar una rama remota!</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Eliminar Múltiples Ramas</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Estás intentando eliminar múltiples ramas a la vez. ¡Asegúrate de comprobar dos veces antes de realizar esta acción!</x:String>
@@ -405,7 +407,7 @@
   <x:String x:Key="Text.Discard.Changes" xml:space="preserve">Cambios:</x:String>
   <x:String x:Key="Text.Discard.IncludeIgnored" xml:space="preserve">Incluir archivos ignorados</x:String>
   <x:String x:Key="Text.Discard.IncludeModified" xml:space="preserve">Incluir archivos modificados/eliminados</x:String>
-  <x:String x:Key="Text.Discard.IncludeUntracked" xml:space="preserve">Incluir archivos no rastreados</x:String>
+  <x:String x:Key="Text.Discard.IncludeUntracked" xml:space="preserve">Incluir archivos sin rastrear</x:String>
   <x:String x:Key="Text.Discard.Total" xml:space="preserve">Total {0} cambios serán descartados</x:String>
   <x:String x:Key="Text.Discard.Warning" xml:space="preserve">¡No puedes deshacer esta acción!</x:String>
   <x:String x:Key="Text.EditBranchDescription" xml:space="preserve">Editar la descripción de la rama</x:String>
@@ -440,6 +442,15 @@
   <x:String x:Key="Text.FileHistory" xml:space="preserve">Historial de Archivos</x:String>
   <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">CAMBIO</x:String>
   <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">CONTENIDO</x:String>
+  <x:String x:Key="Text.FileModeChange" xml:space="preserve">Cambiar modo archivo: </x:String>
+  <x:String x:Key="Text.FileModeChange.Deleted" xml:space="preserve">Modo archivo eliminado: </x:String>
+  <x:String x:Key="Text.FileModeChange.Directory" xml:space="preserve">Directorio</x:String>
+  <x:String x:Key="Text.FileModeChange.Executable" xml:space="preserve">Ejecutable</x:String>
+  <x:String x:Key="Text.FileModeChange.New" xml:space="preserve">Modo archivo nuevo: </x:String>
+  <x:String x:Key="Text.FileModeChange.Normal" xml:space="preserve">Normal</x:String>
+  <x:String x:Key="Text.FileModeChange.Submodule" xml:space="preserve">Submódulo</x:String>
+  <x:String x:Key="Text.FileModeChange.Symlink" xml:space="preserve">Enlace simbólico (Symlink)</x:String>
+  <x:String x:Key="Text.FileModeChange.Unknown" xml:space="preserve">Desconocido</x:String>
   <x:String x:Key="Text.GitFlow" xml:space="preserve">Git-Flow</x:String>
   <x:String x:Key="Text.GitFlow.DevelopBranch" xml:space="preserve">Rama de Desarrollo:</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Feature:</x:String>
@@ -885,7 +896,7 @@
   <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Ruta de almacenamiento de la clave privada SSH</x:String>
   <x:String x:Key="Text.Start" xml:space="preserve">INICIAR</x:String>
   <x:String x:Key="Text.Stash" xml:space="preserve">Stash</x:String>
-  <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Incluir archivos no rastreados</x:String>
+  <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Incluir archivos sin rastrear</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Mensaje:</x:String>
   <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">Opcional. Información de este stash</x:String>
   <x:String x:Key="Text.Stash.Mode" xml:space="preserve">Modo:</x:String>
@@ -978,8 +989,9 @@
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore" xml:space="preserve">Git Ignore</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.Extension" xml:space="preserve">Ignorar todos los archivos *{0}</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">Ignorar archivos *{0} en la misma carpeta</x:String>
-  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InFolder" xml:space="preserve">Ignorar archivos no rastreados en esta carpeta</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InFolder" xml:space="preserve">Ignorar archivos sin rastrear en esta carpeta</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Ignorar solo este archivo</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder" xml:space="preserve">Ignorar todos los archivos sin rastrear en la misma carpeta</x:String>
   <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Enmendar</x:String>
   <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Puedes hacer stage a este archivo ahora.</x:String>
   <x:String x:Key="Text.WorkingCopy.ClearCommitHistories" xml:space="preserve">Limpiar Historial</x:String>
@@ -999,7 +1011,7 @@
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">LOS CONFLICTOS DE ARCHIVOS ESTÁN RESUELTOS</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.UseMine" xml:space="preserve">USAR MÍOS</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.UseTheirs" xml:space="preserve">USAR SUYOS</x:String>
-  <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUIR ARCHIVOS NO RASTREADOS</x:String>
+  <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUIR ARCHIVOS SIN RASTREAR</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NO HAY MENSAJES DE ENTRADA RECIENTES</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NO HAY PLANTILLAS DE COMMIT</x:String>
   <x:String x:Key="Text.WorkingCopy.NoVerify" xml:space="preserve">Sin verificar</x:String>

From a6be30c6a6757be93b82c949c6bb0081d0d0ad62 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 5 Jul 2026 01:31:54 +0000
Subject: [PATCH 22/42] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 1eb8f053b4..79d39ae5d3 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -154,25 +154,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-98.82%25-yellow)
-
-<details>
-<summary>Missing keys in es_ES.axaml</summary>
-
-- Text.DeleteBranch.AskForRemote
-- Text.DeleteBranch.Force
-- Text.FileModeChange
-- Text.FileModeChange.Deleted
-- Text.FileModeChange.Directory
-- Text.FileModeChange.Executable
-- Text.FileModeChange.New
-- Text.FileModeChange.Normal
-- Text.FileModeChange.Submodule
-- Text.FileModeChange.Symlink
-- Text.FileModeChange.Unknown
-- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
-
-</details>
+### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 
 ### ![fr__FR](https://img.shields.io/badge/fr__FR-95.97%25-yellow)
 

From 2750812a702e7b93e39b4263830a76c06a776f82 Mon Sep 17 00:00:00 2001
From: AquariusStar <48148723+AquariusStar@users.noreply.github.com>
Date: Mon, 6 Jul 2026 05:00:53 +0300
Subject: [PATCH 23/42] localization: update Russian translate (#2514)

---
 src/Resources/Locales/ru_RU.axaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 9bf74e96e8..a7ba06f7ad 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -346,7 +346,9 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Принудительно удалить даже если содержит локальные изменения.</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Подмодуль:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Удалить ветку</x:String>
+  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">Вы хотите также удалить следующую удалённую ветку?</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Ветка:</x:String>
+  <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Принудительно удалить, даже если содержит неслитые ревизии</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Вы собираетесь удалить внешнюю ветку!!!</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Удаление нескольких веток</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Вы пытаетесь удалить несколько веток одновременно. Обязательно перепроверьте, прежде чем предпринимать какие-либо действия!</x:String>
@@ -440,6 +442,15 @@
   <x:String x:Key="Text.FileHistory" xml:space="preserve">История файлов</x:String>
   <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">ИЗМЕНИТЬ</x:String>
   <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">СОДЕРЖИМОЕ</x:String>
+  <x:String x:Key="Text.FileModeChange" xml:space="preserve">Изменение режима файла: </x:String>
+  <x:String x:Key="Text.FileModeChange.Deleted" xml:space="preserve">Режим удалённого файла: </x:String>
+  <x:String x:Key="Text.FileModeChange.Directory" xml:space="preserve">Каталог</x:String>
+  <x:String x:Key="Text.FileModeChange.Executable" xml:space="preserve">Исполняемый</x:String>
+  <x:String x:Key="Text.FileModeChange.New" xml:space="preserve">Новый режим файла: </x:String>
+  <x:String x:Key="Text.FileModeChange.Normal" xml:space="preserve">Обычный</x:String>
+  <x:String x:Key="Text.FileModeChange.Submodule" xml:space="preserve">Подмодуль</x:String>
+  <x:String x:Key="Text.FileModeChange.Symlink" xml:space="preserve">Символическая сскла</x:String>
+  <x:String x:Key="Text.FileModeChange.Unknown" xml:space="preserve">Неизвестно</x:String>
   <x:String x:Key="Text.GitFlow" xml:space="preserve">Git-процесс</x:String>
   <x:String x:Key="Text.GitFlow.DevelopBranch" xml:space="preserve">Ветка разработчика:</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Свойство:</x:String>
@@ -980,6 +991,7 @@
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">Игнорировать *{0} файлы в том же каталоге</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InFolder" xml:space="preserve">Игнорировать неотслеживаемые файлы в этом каталоге</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Игнорировать только эти файлы</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder" xml:space="preserve">Игнорировать все неотслеживаемые файлы в одном и том же каталоге</x:String>
   <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Изменить</x:String>
   <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Теперь вы можете сформировать этот файл.</x:String>
   <x:String x:Key="Text.WorkingCopy.ClearCommitHistories" xml:space="preserve">Очистить историю</x:String>

From 37d9c47a17cd7fd07cf44db07e717ff5ec97d5aa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2026 02:01:04 +0000
Subject: [PATCH 24/42] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 79d39ae5d3..0db6110bd3 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -972,25 +972,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-98.82%25-yellow)
-
-<details>
-<summary>Missing keys in ru_RU.axaml</summary>
-
-- Text.DeleteBranch.AskForRemote
-- Text.DeleteBranch.Force
-- Text.FileModeChange
-- Text.FileModeChange.Deleted
-- Text.FileModeChange.Directory
-- Text.FileModeChange.Executable
-- Text.FileModeChange.New
-- Text.FileModeChange.Normal
-- Text.FileModeChange.Submodule
-- Text.FileModeChange.Symlink
-- Text.FileModeChange.Unknown
-- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
-
-</details>
+### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
 ### ![ta__IN](https://img.shields.io/badge/ta__IN-64.83%25-red)
 

From 673a66f0f0e9e6130557b427a1c7d062b3cc04e4 Mon Sep 17 00:00:00 2001
From: Panayotis <panayotis@panayotis.com>
Date: Mon, 6 Jul 2026 05:01:55 +0300
Subject: [PATCH 25/42] localization: complete Greek (el_GR) translation
 (#2515)

Add the 30 remaining Text.* keys that were missing from el_GR relative to
en_US, bringing the Greek locale to full coverage. Wording follows the
existing el_GR conventions (git jargon such as checkout, rebase, commit,
Patch, HEAD kept as loanwords; 'mode' kept for git file-mode codes).

(cherry picked from commit 2274c4154df2de8d980822ef33a64bdf96161eb8)
---
 src/Resources/Locales/el_GR.axaml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/Resources/Locales/el_GR.axaml b/src/Resources/Locales/el_GR.axaml
index 7f1da3c39d..0b537616e3 100644
--- a/src/Resources/Locales/el_GR.axaml
+++ b/src/Resources/Locales/el_GR.axaml
@@ -32,6 +32,9 @@
   <x:String x:Key="Text.Apply.3Way" xml:space="preserve">Τριμερής συγχώνευση (3-Way)</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Επιλέξτε αρχείο .patch για εφαρμογή</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Αγνόηση αλλαγών κενών χαρακτήρων</x:String>
+  <x:String x:Key="Text.Apply.Source" xml:space="preserve">Πηγή:</x:String>
+  <x:String x:Key="Text.Apply.Source.File" xml:space="preserve">Αρχείο</x:String>
+  <x:String x:Key="Text.Apply.Source.Clipboard" xml:space="preserve">Πρόχειρο</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Εφαρμογή Patch</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Κενά:</x:String>
   <x:String x:Key="Text.ApplyStash" xml:space="preserve">Εφαρμογή Stash</x:String>
@@ -55,6 +58,8 @@
   <x:String x:Key="Text.Bisect.Bad">Κακό</x:String>
   <x:String x:Key="Text.Bisect.Good">Καλό</x:String>
   <x:String x:Key="Text.Bisect.Skip">Παράλειψη</x:String>
+  <x:String x:Key="Text.Bisect.WaitingForCheckoutAnother" xml:space="preserve">Εκτέλεση bisect. Κάντε checkout σε άλλο και μετά σημειώστε το ως καλό ή κακό.</x:String>
+  <x:String x:Key="Text.Bisect.WaitingForFirstBad" xml:space="preserve">Εκτέλεση bisect. Σημειώστε το τρέχον commit ως κακό ή κάντε checkout σε άλλο και μετά σημειώστε το ως κακό.</x:String>
   <x:String x:Key="Text.Bisect.WaitingForFirstGood">Εκτέλεση bisect. Σημειώστε το τρέχον commit ως καλό ή κακό και κάντε checkout σε άλλο.</x:String>
   <x:String x:Key="Text.Bisect.WaitingForMark">Εκτέλεση bisect. Το τρέχον HEAD είναι καλό ή κακό;</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
@@ -120,6 +125,9 @@
   <x:String x:Key="Text.CheckoutBranchFromStash" xml:space="preserve">Checkout κλάδου από Stash</x:String>
   <x:String x:Key="Text.CheckoutBranchFromStash.Branch" xml:space="preserve">Νέος κλάδος:</x:String>
   <x:String x:Key="Text.CheckoutBranchFromStash.Stash" xml:space="preserve">Stash:</x:String>
+  <x:String x:Key="Text.CheckoutDetached" xml:space="preserve">Checkout commit ή ετικέτας</x:String>
+  <x:String x:Key="Text.CheckoutDetached.Target" xml:space="preserve">Στόχος:</x:String>
+  <x:String x:Key="Text.CheckoutDetached.Warning" xml:space="preserve">Προσοχή: Μετά από αυτό, το HEAD θα αποσυνδεθεί (detached)</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Προσθήκη πηγής στο μήνυμα commit</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit:</x:String>
@@ -248,6 +256,7 @@
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Λεπτό(-ά)</x:String>
   <x:String x:Key="Text.Configure.Git.ConventionalTypesOverride" xml:space="preserve">Τύποι Conventional Commit</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Προεπιλεγμένο απομακρυσμένο</x:String>
+  <x:String x:Key="Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules" xml:space="preserve">Ενεργοποίηση `--recursive` κατά την αυτόματη ενημέρωση υπομονάδων</x:String>
   <x:String x:Key="Text.Configure.Git.PreferredMergeMode" xml:space="preserve">Προτιμώμενος τρόπος συγχώνευσης</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ΣΥΣΤΗΜΑ ΠΑΡΑΚΟΛΟΥΘΗΣΗΣ ΖΗΤΗΜΑΤΩΝ</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Προσθήκη κανόνα Azure DevOps</x:String>
@@ -305,6 +314,7 @@
   <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Τύπος αλλαγής:</x:String>
   <x:String x:Key="Text.Copy" xml:space="preserve">Αντιγραφή</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Αντιγραφή όλου του κειμένου</x:String>
+  <x:String x:Key="Text.CopyAsPatch" xml:space="preserve">Αντιγραφή ως Patch</x:String>
   <x:String x:Key="Text.CopyFullPath" xml:space="preserve">Αντιγραφή πλήρους διαδρομής</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Αντιγραφή διαδρομής</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Δημιουργία κλάδου...</x:String>
@@ -336,7 +346,9 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Εξαναγκασμός απο-αρχικοποίησης ακόμη κι αν περιέχει τοπικές αλλαγές.</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Υπομονάδα:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Διαγραφή κλάδου</x:String>
+  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">Θέλετε να διαγράψετε και τον ακόλουθο απομακρυσμένο κλάδο;</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Κλάδος:</x:String>
+  <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Εξαναγκασμένη διαγραφή ακόμη κι αν περιέχει μη συγχωνευμένα commit</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Πρόκειται να διαγράψετε έναν απομακρυσμένο κλάδο!!!</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Διαγραφή πολλαπλών κλάδων</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Προσπαθείτε να διαγράψετε πολλούς κλάδους ταυτόχρονα. Βεβαιωθείτε ότι ελέγξατε ξανά πριν προχωρήσετε!</x:String>
@@ -357,6 +369,7 @@
   <x:String x:Key="Text.DeleteTag.Tag" xml:space="preserve">Ετικέτα:</x:String>
   <x:String x:Key="Text.DeleteTag.WithRemote" xml:space="preserve">Διαγραφή από τα απομακρυσμένα αποθετήρια</x:String>
   <x:String x:Key="Text.Diff.Binary" xml:space="preserve">ΔΥΑΔΙΚΟ DIFF</x:String>
+  <x:String x:Key="Text.Diff.EmptyFile" xml:space="preserve">ΚΕΝΟ ΑΡΧΕΙΟ</x:String>
   <x:String x:Key="Text.Diff.First" xml:space="preserve">Πρώτη διαφορά</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Αγνόηση αλλαγών κενών χαρακτήρων</x:String>
   <x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">ΑΝΑΜΕΙΞΗ</x:String>
@@ -429,14 +442,25 @@
   <x:String x:Key="Text.FileHistory" xml:space="preserve">Ιστορικό αρχείου</x:String>
   <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">ΑΛΛΑΓΗ</x:String>
   <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">ΠΕΡΙΕΧΟΜΕΝΟ</x:String>
+  <x:String x:Key="Text.FileModeChange" xml:space="preserve">Αλλαγή mode αρχείου: </x:String>
+  <x:String x:Key="Text.FileModeChange.Deleted" xml:space="preserve">mode διαγραμμένου αρχείου: </x:String>
+  <x:String x:Key="Text.FileModeChange.Directory" xml:space="preserve">Κατάλογος</x:String>
+  <x:String x:Key="Text.FileModeChange.Executable" xml:space="preserve">Εκτελέσιμο</x:String>
+  <x:String x:Key="Text.FileModeChange.New" xml:space="preserve">mode νέου αρχείου: </x:String>
+  <x:String x:Key="Text.FileModeChange.Normal" xml:space="preserve">Κανονικό</x:String>
+  <x:String x:Key="Text.FileModeChange.Submodule" xml:space="preserve">Υπομονάδα</x:String>
+  <x:String x:Key="Text.FileModeChange.Symlink" xml:space="preserve">Συμβολικός σύνδεσμος</x:String>
+  <x:String x:Key="Text.FileModeChange.Unknown" xml:space="preserve">Άγνωστο</x:String>
   <x:String x:Key="Text.GitFlow" xml:space="preserve">Git-Flow</x:String>
   <x:String x:Key="Text.GitFlow.DevelopBranch" xml:space="preserve">Κλάδος ανάπτυξης:</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Feature:</x:String>
   <x:String x:Key="Text.GitFlow.FeaturePrefix" xml:space="preserve">Πρόθεμα Feature:</x:String>
+  <x:String x:Key="Text.GitFlow.Finish" xml:space="preserve">Ολοκλήρωση ${0}$</x:String>
   <x:String x:Key="Text.GitFlow.FinishFeature" xml:space="preserve">FLOW - Ολοκλήρωση Feature</x:String>
   <x:String x:Key="Text.GitFlow.FinishHotfix" xml:space="preserve">FLOW - Ολοκλήρωση Hotfix</x:String>
   <x:String x:Key="Text.GitFlow.FinishRelease" xml:space="preserve">FLOW - Ολοκλήρωση Release</x:String>
   <x:String x:Key="Text.GitFlow.FinishTarget" xml:space="preserve">Στόχος:</x:String>
+  <x:String x:Key="Text.GitFlow.FinishWithRebase" xml:space="preserve">Rebase πριν τη συγχώνευση</x:String>
   <x:String x:Key="Text.GitFlow.FinishWithSquash" xml:space="preserve">Squash κατά τη συγχώνευση</x:String>
   <x:String x:Key="Text.GitFlow.Hotfix" xml:space="preserve">Hotfix:</x:String>
   <x:String x:Key="Text.GitFlow.HotfixPrefix" xml:space="preserve">Πρόθεμα Hotfix:</x:String>
@@ -445,10 +469,12 @@
   <x:String x:Key="Text.GitFlow.ProductionBranch" xml:space="preserve">Κλάδος παραγωγής:</x:String>
   <x:String x:Key="Text.GitFlow.Release" xml:space="preserve">Release:</x:String>
   <x:String x:Key="Text.GitFlow.ReleasePrefix" xml:space="preserve">Πρόθεμα Release:</x:String>
+  <x:String x:Key="Text.GitFlow.StartAt" xml:space="preserve">Έναρξη στο:</x:String>
   <x:String x:Key="Text.GitFlow.StartFeature" xml:space="preserve">Έναρξη Feature...</x:String>
   <x:String x:Key="Text.GitFlow.StartFeatureTitle" xml:space="preserve">FLOW - Έναρξη Feature</x:String>
   <x:String x:Key="Text.GitFlow.StartHotfix" xml:space="preserve">Έναρξη Hotfix...</x:String>
   <x:String x:Key="Text.GitFlow.StartHotfixTitle" xml:space="preserve">FLOW - Έναρξη Hotfix</x:String>
+  <x:String x:Key="Text.GitFlow.StartName" xml:space="preserve">Όνομα:</x:String>
   <x:String x:Key="Text.GitFlow.StartPlaceholder" xml:space="preserve">Εισαγάγετε όνομα</x:String>
   <x:String x:Key="Text.GitFlow.StartRelease" xml:space="preserve">Έναρξη Release...</x:String>
   <x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">FLOW - Έναρξη Release</x:String>
@@ -921,6 +947,7 @@
   <x:String x:Key="Text.Sure" xml:space="preserve">ΟΚ</x:String>
   <x:String x:Key="Text.Tag.Tagger" xml:space="preserve">ΔΗΜΙΟΥΡΓΟΣ ΕΤΙΚΕΤΑΣ</x:String>
   <x:String x:Key="Text.Tag.Time" xml:space="preserve">ΩΡΑ</x:String>
+  <x:String x:Key="Text.TagCM.Checkout" xml:space="preserve">Checkout ετικέτας...</x:String>
   <x:String x:Key="Text.TagCM.CompareTwo" xml:space="preserve">Σύγκριση 2 ετικετών</x:String>
   <x:String x:Key="Text.TagCM.CompareWith" xml:space="preserve">Σύγκριση με...</x:String>
   <x:String x:Key="Text.TagCM.CompareWithHead" xml:space="preserve">Σύγκριση με το HEAD</x:String>
@@ -931,11 +958,13 @@
   <x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">Προσαρμοσμένη ενέργεια</x:String>
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Διαγραφή ${0}$...</x:String>
   <x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">Διαγραφή {0} επιλεγμένων ετικετών...</x:String>
+  <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Συγχώνευση ${0}$ στο ${1}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push ${0}$...</x:String>
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Ενημέρωση υπομονάδων</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Όλες οι υπομονάδες</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Αρχικοποίηση όπου χρειάζεται</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Υπομονάδα:</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Ενημέρωση ένθετων υπομονάδων</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UpdateToRemoteTrackingBranch" xml:space="preserve">Ενημέρωση στον απομακρυσμένο κλάδο παρακολούθησης της υπομονάδας</x:String>
   <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
   <x:String x:Key="Text.ViewLogs" xml:space="preserve">Καταγραφές</x:String>
@@ -962,6 +991,7 @@
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">Αγνόηση αρχείων *{0} στον ίδιο φάκελο</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InFolder" xml:space="preserve">Αγνόηση μη παρακολουθούμενων αρχείων σε αυτόν τον φάκελο</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Αγνόηση μόνο αυτού του αρχείου</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder" xml:space="preserve">Αγνόηση όλων των μη παρακολουθούμενων αρχείων στον ίδιο φάκελο</x:String>
   <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Τροποποίηση</x:String>
   <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Μπορείτε να προσθέσετε αυτό το αρχείο στο ευρετήριο τώρα.</x:String>
   <x:String x:Key="Text.WorkingCopy.ClearCommitHistories" xml:space="preserve">Εκκαθάριση ιστορικού</x:String>

From 2ea100fc923020b5eb84da8a6952d0c67d66dd7a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2026 02:03:52 +0000
Subject: [PATCH 26/42] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 0db6110bd3..9eb110b99c 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -116,43 +116,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![el__GR](https://img.shields.io/badge/el__GR-97.05%25-yellow)
-
-<details>
-<summary>Missing keys in el_GR.axaml</summary>
-
-- Text.Apply.Source
-- Text.Apply.Source.File
-- Text.Apply.Source.Clipboard
-- Text.Bisect.WaitingForCheckoutAnother
-- Text.Bisect.WaitingForFirstBad
-- Text.CheckoutDetached
-- Text.CheckoutDetached.Target
-- Text.CheckoutDetached.Warning
-- Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules
-- Text.CopyAsPatch
-- Text.DeleteBranch.AskForRemote
-- Text.DeleteBranch.Force
-- Text.Diff.EmptyFile
-- Text.FileModeChange
-- Text.FileModeChange.Deleted
-- Text.FileModeChange.Directory
-- Text.FileModeChange.Executable
-- Text.FileModeChange.New
-- Text.FileModeChange.Normal
-- Text.FileModeChange.Submodule
-- Text.FileModeChange.Symlink
-- Text.FileModeChange.Unknown
-- Text.GitFlow.Finish
-- Text.GitFlow.FinishWithRebase
-- Text.GitFlow.StartAt
-- Text.GitFlow.StartName
-- Text.TagCM.Checkout
-- Text.TagCM.Merge
-- Text.UpdateSubmodules.Recursive
-- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
-
-</details>
+### ![el__GR](https://img.shields.io/badge/el__GR-%E2%88%9A-brightgreen)
 
 ### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 

From 222cd802728a26b4b73134136c3cf27665a85c7c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 6 Jul 2026 10:13:48 +0800
Subject: [PATCH 27/42] =?UTF-8?q?ux:=20use=20`Ctrl/=E2=8C=98+W`=20to=20clo?=
 =?UTF-8?q?se=20sub-windows?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/ChromelessWindow.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Views/ChromelessWindow.cs b/src/Views/ChromelessWindow.cs
index ffc7445981..a06ab75656 100644
--- a/src/Views/ChromelessWindow.cs
+++ b/src/Views/ChromelessWindow.cs
@@ -119,6 +119,11 @@ protected override void OnKeyDown(KeyEventArgs e)
                     ViewModels.Preferences.Instance.Zoom = zoom;
                     e.Handled = true;
                 }
+                else if (e.Key == Key.W)
+                {
+                    Close();
+                    e.Handled = true;
+                }
             }
         }
 

From 7327ccd266b7a49e3ae90c831bb521d955eb5da6 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 6 Jul 2026 14:29:02 +0800
Subject: [PATCH 28/42] localization: update Chinese translations

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/zh_CN.axaml | 1 +
 src/Resources/Locales/zh_TW.axaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 36b5f21eca..d191175c22 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -346,6 +346,7 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">强制取消，即使包含本地变更</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">子模块 ：</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">删除分支确认</x:String>
+  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">是否同时删除以下远程分支？</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名 ：</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">强制删除，即使包含未合并的提交</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在删除远程上的分支，请务必小心！！！</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 6a238a5ea4..fd0b454b2f 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -346,6 +346,7 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">強制取消，即使包含本機變更</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">子模組:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">刪除分支確認</x:String>
+  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">您是否也想刪除以下遠端分支?</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名稱:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">強制刪除，即使包含未合併的提交</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在刪除遠端上的分支，請務必小心!</x:String>

From e6bf4b98f2d3bc5aa8716b15e34387eb71aad345 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2026 06:29:23 +0000
Subject: [PATCH 29/42] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 9eb110b99c..2297d1157c 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1662,20 +1662,6 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-99.90%25-yellow)
+### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 
-<details>
-<summary>Missing keys in zh_CN.axaml</summary>
-
-- Text.DeleteBranch.AskForRemote
-
-</details>
-
-### ![zh__TW](https://img.shields.io/badge/zh__TW-99.90%25-yellow)
-
-<details>
-<summary>Missing keys in zh_TW.axaml</summary>
-
-- Text.DeleteBranch.AskForRemote
-
-</details>
\ No newline at end of file
+### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)
\ No newline at end of file

From 6077e541f99a7832d04beb71e1e4900e0a4bac5b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 6 Jul 2026 17:06:35 +0800
Subject: [PATCH 30/42] project: upgrade AvaloniaEdit

Signed-off-by: leo <longshuang@msn.cn>
---
 depends/AvaloniaEdit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/AvaloniaEdit b/depends/AvaloniaEdit
index 3451f4e0bd..11bf2b6a82 160000
--- a/depends/AvaloniaEdit
+++ b/depends/AvaloniaEdit
@@ -1 +1 @@
-Subproject commit 3451f4e0bdfaf05d927446f63cde8359a5e79eca
+Subproject commit 11bf2b6a8265329974606604ecc96ece8bfbc0b9

From 68d1347722d22c73933c06fca9f38a46aee39d8e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 6 Jul 2026 19:06:21 +0800
Subject: [PATCH 31/42] fix: diff view does not update when selecting between
 an unstage new submodule and other file

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/DiffContext.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index 4330f5e924..d70c8448b9 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -118,8 +118,12 @@ private void LoadContent()
         {
             if (_option.Path.EndsWith('/'))
             {
-                Content = null;
+                OldMode = 0;
+                NewMode = 160000;
                 IsTextDiff = false;
+                IsIgnoreWhitespaceVisible = false;
+                Content = null;
+                _info = null;
                 return;
             }
 

From 2a12e0406fc707dd7e9a9b96eef5af38d86af7d4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 6 Jul 2026 19:12:25 +0800
Subject: [PATCH 32/42] ux: submodule diff style

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/DiffView.axaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 91dc271181..a3a905e084 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -291,7 +291,8 @@
                   </Border>
 
                   <Border Margin="0,8"
-                          BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
+                          BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
+                          CornerRadius="4"
                           Background="{DynamicResource Brush.Window}"
                           IsVisible="{Binding Old, Converter={x:Static ObjectConverters.IsNotNull}}">
                     <ContentControl Content="{Binding Old}">
@@ -318,6 +319,7 @@
 
                   <Border Margin="0,8"
                           BorderThickness="1" BorderBrush="Green"
+                          CornerRadius="4"
                           Background="{DynamicResource Brush.Window}"
                           IsVisible="{Binding New, Converter={x:Static ObjectConverters.IsNotNull}}">
                     <ContentControl Content="{Binding New}">

From ed9ec4722f27974eb233904d1062690737d6216a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 7 Jul 2026 12:03:26 +0800
Subject: [PATCH 33/42] refactor: improve submodule diff loading

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Diff.cs                   | 30 ++++++++-
 src/Commands/QuerySubmoduleRevision.cs | 67 +++++++++++++++++++
 src/Models/DiffResult.cs               |  2 +-
 src/ViewModels/DiffContext.cs          | 89 +++++++++-----------------
 4 files changed, 126 insertions(+), 62 deletions(-)
 create mode 100644 src/Commands/QuerySubmoduleRevision.cs

diff --git a/src/Commands/Diff.cs b/src/Commands/Diff.cs
index ecfb24c42d..6edeff5407 100644
--- a/src/Commands/Diff.cs
+++ b/src/Commands/Diff.cs
@@ -33,6 +33,7 @@ public partial class Diff : Command
         private const string SPECIAL_DIFF_START = "diff ";
         private const string SPECIAL_BINARY = "Binary files ";
         private const string SPECIAL_NO_NEWLINE = " No newline at end of file";
+        private const string SPECIAL_SUBMODULE = "Subproject commit ";
 
         public Diff(string repo, Models.DiffOption opt, int numContextLines, bool ignoreWhitespace, bool ignoreCRAtEOL)
         {
@@ -92,7 +93,7 @@ public Diff(string repo, Models.DiffOption opt, int numContextLines, bool ignore
                 // Ignore exceptions.
             }
 
-            if (_result.IsBinary || _result.IsLFS || _result.TextDiff.Lines.Count == 0)
+            if (_isLFS || _result.IsBinary || _result.TextDiff.Lines.Count == 0)
             {
                 _result.TextDiff = null;
             }
@@ -104,6 +105,28 @@ public Diff(string repo, Models.DiffOption opt, int numContextLines, bool ignore
                     _isInChunk = false;
                 }
 
+                if (_result.TextDiff.Lines.Count < 4)
+                {
+                    var isSubmoduleChange = true;
+
+                    for (int i = 1; i < _result.TextDiff.Lines.Count; i++)
+                    {
+                        var line = _result.TextDiff.Lines[i];
+                        if (!line.Content.StartsWith(SPECIAL_SUBMODULE, StringComparison.Ordinal))
+                        {
+                            isSubmoduleChange = false;
+                            break;
+                        }
+                    }
+
+                    if (isSubmoduleChange)
+                    {
+                        _result.IsSubmoduleChange = true;
+                        _result.TextDiff = null;
+                        return _result;
+                    }
+                }
+
                 _result.TextDiff.MaxLineNumber = Math.Max(_newLine, _oldLine);
                 _result.TextDiff.OldMode = _result.OldMode;
                 _result.TextDiff.NewMode = _result.NewMode;
@@ -254,7 +277,7 @@ private bool ParseFileModeChange(string line)
 
         private bool ParseLFSChange(char prefix, string content)
         {
-            if (_result.IsLFS)
+            if (_isLFS)
             {
                 if (prefix == PREFIX_DELETED)
                 {
@@ -284,7 +307,7 @@ private bool ParseLFSChange(char prefix, string content)
             {
                 if (content.StartsWith(LFS_SPECIFIER, StringComparison.Ordinal))
                 {
-                    _result.IsLFS = true;
+                    _isLFS = true;
                     _result.LFSDiff = new Models.LFSDiff();
                     return true;
                 }
@@ -340,5 +363,6 @@ private void ProcessInlineHighlights()
         private int _oldLine = 0;
         private int _newLine = 0;
         private bool _isInChunk = false;
+        private bool _isLFS = false;
     }
 }
diff --git a/src/Commands/QuerySubmoduleRevision.cs b/src/Commands/QuerySubmoduleRevision.cs
new file mode 100644
index 0000000000..a70f1efb68
--- /dev/null
+++ b/src/Commands/QuerySubmoduleRevision.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Threading.Tasks;
+
+namespace SourceGit.Commands
+{
+    public class QuerySubmoduleRevision : Command
+    {
+        public QuerySubmoduleRevision(string repo, string revision)
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+
+            if (revision.EndsWith("-dirty", StringComparison.Ordinal))
+            {
+                _hasUncommittedChange = true;
+                _revision = revision.Substring(0, revision.Length - 6);
+            }
+            else
+            {
+                _hasUncommittedChange = false;
+                _revision = revision;
+            }
+        }
+
+        public async Task<Models.RevisionSubmodule> GetResultAsync()
+        {
+            Args = $"show --no-show-signature --decorate=full --format=%H%x00%P%x00%D%x00%aN±%aE%x00%at%x00%cN±%cE%x00%ct%x00%s%x00%B -s {_revision}";
+
+            var rs = await ReadToEndAsync().ConfigureAwait(false);
+            if (!rs.IsSuccess || string.IsNullOrEmpty(rs.StdOut))
+                return null;
+
+            var commit = new Models.Commit();
+            var lines = rs.StdOut.Split('\0');
+            if (lines.Length < 9)
+                return null;
+
+            commit.SHA = lines[0];
+            if (!string.IsNullOrEmpty(lines[1]))
+                commit.Parents.AddRange(lines[1].Split(' ', StringSplitOptions.RemoveEmptyEntries));
+            if (!string.IsNullOrEmpty(lines[2]))
+                commit.ParseDecorators(lines[2]);
+            commit.Author = Models.User.FindOrAdd(lines[3]);
+            commit.AuthorTime = ulong.Parse(lines[4]);
+            commit.Committer = Models.User.FindOrAdd(lines[5]);
+            commit.CommitterTime = ulong.Parse(lines[6]);
+            commit.Subject = lines[7];
+
+            var message = new Models.CommitFullMessage() { Message = lines[8].TrimEnd() };
+            var uncommittedChangesCount = 0;
+            if (_hasUncommittedChange)
+                uncommittedChangesCount = await new CountLocalChanges(WorkingDirectory, true)
+                    .GetResultAsync()
+                    .ConfigureAwait(false);
+
+            return new Models.RevisionSubmodule()
+            {
+                Commit = commit,
+                FullMessage = message,
+                UncommittedChanges = uncommittedChangesCount
+            };
+        }
+
+        private bool _hasUncommittedChange = false;
+        private string _revision = string.Empty;
+    }
+}
diff --git a/src/Models/DiffResult.cs b/src/Models/DiffResult.cs
index d1564cce36..ddb3d7e07a 100644
--- a/src/Models/DiffResult.cs
+++ b/src/Models/DiffResult.cs
@@ -101,7 +101,7 @@ public class SubmoduleDiff
     public class DiffResult
     {
         public bool IsBinary { get; set; } = false;
-        public bool IsLFS { get; set; } = false;
+        public bool IsSubmoduleChange { get; set; } = false;
         public string OldHash { get; set; } = string.Empty;
         public string NewHash { get; set; } = string.Empty;
         public int OldMode { get; set; } = 0;
diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index d70c8448b9..5debfbb678 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -145,40 +145,17 @@ private void LoadContent()
                 _info = info;
 
                 object rs = null;
-                if (latest.TextDiff != null)
+                if (latest.TextDiff is { } textDiff)
                 {
-                    var count = latest.TextDiff.Lines.Count;
-                    var isSubmodule = false;
-                    if (count <= 3)
-                    {
-                        var submoduleDiff = new Models.SubmoduleDiff();
-                        var submoduleRoot = $"{_repo}/{_option.Path}".Replace('\\', '/').TrimEnd('/');
-                        isSubmodule = true;
-                        for (int i = 1; i < count; i++)
-                        {
-                            var line = latest.TextDiff.Lines[i];
-                            if (!line.Content.StartsWith("Subproject commit ", StringComparison.Ordinal))
-                            {
-                                isSubmodule = false;
-                                break;
-                            }
-
-                            var sha = line.Content.Substring(18);
-                            if (line.Type == Models.TextDiffLineType.Added)
-                                submoduleDiff.New = await QuerySubmoduleRevisionAsync(submoduleRoot, sha).ConfigureAwait(false);
-                            else if (line.Type == Models.TextDiffLineType.Deleted)
-                                submoduleDiff.Old = await QuerySubmoduleRevisionAsync(submoduleRoot, sha).ConfigureAwait(false);
-                        }
-
-                        if (isSubmodule)
-                        {
-                            submoduleDiff.FullPath = submoduleRoot;
-                            rs = submoduleDiff;
-                        }
-                    }
-
-                    if (!isSubmodule)
-                        rs = latest.TextDiff;
+                    rs = textDiff;
+                }
+                else if (latest.LFSDiff is { } lfs)
+                {
+                    var imgDecoder = ImageSource.GetDecoder(_option.Path);
+                    if (imgDecoder != Models.ImageDecoder.None)
+                        rs = new LFSImageDiff(_repo, lfs, imgDecoder);
+                    else
+                        rs = lfs;
                 }
                 else if (latest.IsBinary)
                 {
@@ -235,13 +212,23 @@ private void LoadContent()
                         rs = binaryDiff;
                     }
                 }
-                else if (latest.IsLFS)
+                else if (latest.IsSubmoduleChange)
                 {
-                    var imgDecoder = ImageSource.GetDecoder(_option.Path);
-                    if (imgDecoder != Models.ImageDecoder.None)
-                        rs = new LFSImageDiff(_repo, latest.LFSDiff, imgDecoder);
-                    else
-                        rs = latest.LFSDiff;
+                    var submoduleDiff = new Models.SubmoduleDiff();
+                    var submoduleRoot = $"{_repo}/{_option.Path}".Replace('\\', '/').TrimEnd('/');
+                    submoduleDiff.FullPath = submoduleRoot;
+
+                    if (IsValidSubmoduleHash(latest.OldHash))
+                        submoduleDiff.Old = await new Commands.QuerySubmoduleRevision(submoduleRoot, latest.OldHash)
+                            .GetResultAsync()
+                            .ConfigureAwait(false);
+
+                    if (IsValidSubmoduleHash(latest.NewHash))
+                        submoduleDiff.New = await new Commands.QuerySubmoduleRevision(submoduleRoot, latest.NewHash)
+                            .GetResultAsync()
+                            .ConfigureAwait(false);
+
+                    rs = submoduleDiff;
                 }
                 else if (IsEmptyFileHash(latest.OldHash) || IsEmptyFileHash(latest.NewHash))
                 {
@@ -277,29 +264,15 @@ private void LoadContent()
             });
         }
 
-        private async Task<Models.RevisionSubmodule> QuerySubmoduleRevisionAsync(string repo, string sha)
+        private bool IsValidSubmoduleHash(string hash)
         {
-            if (!File.Exists(Path.Combine(repo, ".git")))
-                return new Models.RevisionSubmodule() { Commit = new Models.Commit() { SHA = sha } };
-
-            var uncommittedChangesCount = 0;
-            if (sha.EndsWith("-dirty", StringComparison.Ordinal))
+            for (int i = 0; i < hash.Length; i++)
             {
-                sha = sha.Substring(0, sha.Length - 6);
-                uncommittedChangesCount = await new Commands.CountLocalChanges(repo, true).GetResultAsync().ConfigureAwait(false);
+                if (hash[i] != '0')
+                    return true;
             }
 
-            var commit = await new Commands.QuerySingleCommit(repo, sha).GetResultAsync().ConfigureAwait(false);
-            if (commit == null)
-                return new Models.RevisionSubmodule() { Commit = new Models.Commit() { SHA = sha } };
-
-            var body = await new Commands.QueryCommitFullMessage(repo, sha).GetResultAsync().ConfigureAwait(false);
-            return new Models.RevisionSubmodule()
-            {
-                Commit = commit,
-                FullMessage = new Models.CommitFullMessage { Message = body },
-                UncommittedChanges = uncommittedChangesCount
-            };
+            return false;
         }
 
         private bool IsEmptyFileHash(string hash)

From c0dc434f9615587b71882ed5618262d5f9141f7f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 7 Jul 2026 19:25:12 +0800
Subject: [PATCH 34/42] enhance: do not query file content if revision is an
 empty tree hash

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/ImageSource.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/ViewModels/ImageSource.cs b/src/ViewModels/ImageSource.cs
index af4f3a7f7f..ac4ee2cc5c 100644
--- a/src/ViewModels/ImageSource.cs
+++ b/src/ViewModels/ImageSource.cs
@@ -46,6 +46,13 @@ public static async Task<ImageSource> FromFileAsync(string fullpath, Models.Imag
 
         public static async Task<ImageSource> FromRevisionAsync(string repo, string revision, string file, Models.ImageDecoder decoder)
         {
+            if (string.IsNullOrEmpty(revision))
+                return new ImageSource(null, 0);
+
+            var emptyTreeHash = Models.EmptyTreeHash.Guess(revision);
+            if (emptyTreeHash.Equals(revision, StringComparison.Ordinal))
+                return new ImageSource(null, 0);
+
             await using var stream = await Commands.QueryFileContent.RunAsync(repo, revision, file).ConfigureAwait(false);
             return await Task.Run(() => LoadFromStream(stream, decoder)).ConfigureAwait(false);
         }

From 7c62df1cd9f4f4d4b8bffc90178a6c51f695489f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 8 Jul 2026 15:29:18 +0800
Subject: [PATCH 35/42] refactor: creating diff object for
 image/binary/submodule

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/DiffContext.cs | 159 ++++++++++++++++++++--------------
 src/ViewModels/ImageSource.cs |   6 +-
 2 files changed, 100 insertions(+), 65 deletions(-)

diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index 5debfbb678..b2e28d2859 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -159,76 +159,15 @@ private void LoadContent()
                 }
                 else if (latest.IsBinary)
                 {
-                    var oldPath = string.IsNullOrEmpty(_option.OrgPath) ? _option.Path : _option.OrgPath;
                     var imgDecoder = ImageSource.GetDecoder(_option.Path);
-
                     if (imgDecoder != Models.ImageDecoder.None)
-                    {
-                        var imgDiff = new Models.ImageDiff();
-
-                        if (_option.Revisions.Count == 2)
-                        {
-                            var oldImage = await ImageSource.FromRevisionAsync(_repo, _option.Revisions[0], oldPath, imgDecoder).ConfigureAwait(false);
-                            var newImage = await ImageSource.FromRevisionAsync(_repo, _option.Revisions[1], _option.Path, imgDecoder).ConfigureAwait(false);
-                            imgDiff.Old = oldImage.Bitmap;
-                            imgDiff.OldFileSize = oldImage.Size;
-                            imgDiff.New = newImage.Bitmap;
-                            imgDiff.NewFileSize = newImage.Size;
-                        }
-                        else
-                        {
-                            if (!oldPath.Equals("/dev/null", StringComparison.Ordinal))
-                            {
-                                var oldImage = await ImageSource.FromRevisionAsync(_repo, "HEAD", oldPath, imgDecoder).ConfigureAwait(false);
-                                imgDiff.Old = oldImage.Bitmap;
-                                imgDiff.OldFileSize = oldImage.Size;
-                            }
-
-                            var fullPath = Path.Combine(_repo, _option.Path);
-                            if (File.Exists(fullPath))
-                            {
-                                var newImage = await ImageSource.FromFileAsync(fullPath, imgDecoder).ConfigureAwait(false);
-                                imgDiff.New = newImage.Bitmap;
-                                imgDiff.NewFileSize = newImage.Size;
-                            }
-                        }
-
-                        rs = imgDiff;
-                    }
+                        rs = await CreateImageDiffAsync(imgDecoder).ConfigureAwait(false);
                     else
-                    {
-                        var binaryDiff = new Models.BinaryDiff();
-                        if (_option.Revisions.Count == 2)
-                        {
-                            binaryDiff.OldSize = await new Commands.QueryFileSize(_repo, oldPath, _option.Revisions[0]).GetResultAsync().ConfigureAwait(false);
-                            binaryDiff.NewSize = await new Commands.QueryFileSize(_repo, _option.Path, _option.Revisions[1]).GetResultAsync().ConfigureAwait(false);
-                        }
-                        else
-                        {
-                            var fullPath = Path.Combine(_repo, _option.Path);
-                            binaryDiff.OldSize = await new Commands.QueryFileSize(_repo, oldPath, "HEAD").GetResultAsync().ConfigureAwait(false);
-                            binaryDiff.NewSize = File.Exists(fullPath) ? new FileInfo(fullPath).Length : 0;
-                        }
-                        rs = binaryDiff;
-                    }
+                        rs = await CreateBinaryDiffAsync().ConfigureAwait(false);
                 }
                 else if (latest.IsSubmoduleChange)
                 {
-                    var submoduleDiff = new Models.SubmoduleDiff();
-                    var submoduleRoot = $"{_repo}/{_option.Path}".Replace('\\', '/').TrimEnd('/');
-                    submoduleDiff.FullPath = submoduleRoot;
-
-                    if (IsValidSubmoduleHash(latest.OldHash))
-                        submoduleDiff.Old = await new Commands.QuerySubmoduleRevision(submoduleRoot, latest.OldHash)
-                            .GetResultAsync()
-                            .ConfigureAwait(false);
-
-                    if (IsValidSubmoduleHash(latest.NewHash))
-                        submoduleDiff.New = await new Commands.QuerySubmoduleRevision(submoduleRoot, latest.NewHash)
-                            .GetResultAsync()
-                            .ConfigureAwait(false);
-
-                    rs = submoduleDiff;
+                    rs = await CreateSubmoduleDiffAsync(latest).ConfigureAwait(false);
                 }
                 else if (IsEmptyFileHash(latest.OldHash) || IsEmptyFileHash(latest.NewHash))
                 {
@@ -264,6 +203,98 @@ private void LoadContent()
             });
         }
 
+        private async Task<Models.ImageDiff> CreateImageDiffAsync(Models.ImageDecoder imgDecoder)
+        {
+            var oldPath = string.IsNullOrEmpty(_option.OrgPath) ? _option.Path : _option.OrgPath;
+            var imgDiff = new Models.ImageDiff();
+            var fullPath = Path.Combine(_repo, _option.Path);
+
+            if (_option.Revisions.Count == 2)
+            {
+                if (_option.Revisions[0].Equals("-R", StringComparison.Ordinal))
+                {
+                    var oldImage = await ImageSource.FromFileAsync(fullPath, imgDecoder).ConfigureAwait(false);
+                    imgDiff.Old = oldImage.Bitmap;
+                    imgDiff.OldFileSize = oldImage.Size;
+                }
+                else
+                {
+                    var oldImage = await ImageSource.FromRevisionAsync(_repo, _option.Revisions[0], oldPath, imgDecoder).ConfigureAwait(false);
+                    imgDiff.Old = oldImage.Bitmap;
+                    imgDiff.OldFileSize = oldImage.Size;
+                }
+
+                var newImage = await ImageSource.FromRevisionAsync(_repo, _option.Revisions[1], _option.Path, imgDecoder).ConfigureAwait(false);
+                imgDiff.New = newImage.Bitmap;
+                imgDiff.NewFileSize = newImage.Size;
+            }
+            else
+            {
+                if (!oldPath.Equals("/dev/null", StringComparison.Ordinal))
+                {
+                    var oldImage = await ImageSource.FromRevisionAsync(_repo, "HEAD", oldPath, imgDecoder).ConfigureAwait(false);
+                    imgDiff.Old = oldImage.Bitmap;
+                    imgDiff.OldFileSize = oldImage.Size;
+                }
+
+                var newImage = await ImageSource.FromFileAsync(fullPath, imgDecoder).ConfigureAwait(false);
+                imgDiff.New = newImage.Bitmap;
+                imgDiff.NewFileSize = newImage.Size;
+            }
+
+            return imgDiff;
+        }
+
+        private async Task<Models.BinaryDiff> CreateBinaryDiffAsync()
+        {
+            var oldPath = string.IsNullOrEmpty(_option.OrgPath) ? _option.Path : _option.OrgPath;
+            var binaryDiff = new Models.BinaryDiff();
+            var fullPath = Path.Combine(_repo, _option.Path);
+
+            if (_option.Revisions.Count == 2)
+            {
+                if (_option.Revisions[0].Equals("-R", StringComparison.Ordinal))
+                {
+                    binaryDiff.OldSize = File.Exists(fullPath) ? new FileInfo(fullPath).Length : 0;
+                    binaryDiff.NewSize = await new Commands.QueryFileSize(_repo, _option.Path, _option.Revisions[1]).GetResultAsync().ConfigureAwait(false);
+                }
+                else
+                {
+                    binaryDiff.OldSize = await new Commands.QueryFileSize(_repo, oldPath, _option.Revisions[0]).GetResultAsync().ConfigureAwait(false);
+                    if (string.IsNullOrEmpty(_option.Revisions[1]))
+                        binaryDiff.NewSize = File.Exists(fullPath) ? new FileInfo(fullPath).Length : 0;
+                    else
+                        binaryDiff.NewSize = await new Commands.QueryFileSize(_repo, _option.Path, _option.Revisions[1]).GetResultAsync().ConfigureAwait(false);
+                }
+            }
+            else
+            {
+                binaryDiff.OldSize = await new Commands.QueryFileSize(_repo, oldPath, "HEAD").GetResultAsync().ConfigureAwait(false);
+                binaryDiff.NewSize = File.Exists(fullPath) ? new FileInfo(fullPath).Length : 0;
+            }
+
+            return binaryDiff;
+        }
+
+        private async Task<Models.SubmoduleDiff> CreateSubmoduleDiffAsync(Models.DiffResult result)
+        {
+            var submoduleDiff = new Models.SubmoduleDiff();
+            var submoduleRoot = $"{_repo}/{_option.Path}".Replace('\\', '/').TrimEnd('/');
+            submoduleDiff.FullPath = submoduleRoot;
+
+            if (IsValidSubmoduleHash(result.OldHash))
+                submoduleDiff.Old = await new Commands.QuerySubmoduleRevision(submoduleRoot, result.OldHash)
+                    .GetResultAsync()
+                    .ConfigureAwait(false);
+
+            if (IsValidSubmoduleHash(result.NewHash))
+                submoduleDiff.New = await new Commands.QuerySubmoduleRevision(submoduleRoot, result.NewHash)
+                    .GetResultAsync()
+                    .ConfigureAwait(false);
+
+            return submoduleDiff;
+        }
+
         private bool IsValidSubmoduleHash(string hash)
         {
             for (int i = 0; i < hash.Length; i++)
diff --git a/src/ViewModels/ImageSource.cs b/src/ViewModels/ImageSource.cs
index ac4ee2cc5c..392615ab35 100644
--- a/src/ViewModels/ImageSource.cs
+++ b/src/ViewModels/ImageSource.cs
@@ -40,14 +40,18 @@ public static Models.ImageDecoder GetDecoder(string file)
 
         public static async Task<ImageSource> FromFileAsync(string fullpath, Models.ImageDecoder decoder)
         {
+            if (!File.Exists(fullpath))
+                return new ImageSource(null, 0);
+
             await using var stream = File.OpenRead(fullpath);
             return await Task.Run(() => LoadFromStream(stream, decoder)).ConfigureAwait(false);
         }
 
         public static async Task<ImageSource> FromRevisionAsync(string repo, string revision, string file, Models.ImageDecoder decoder)
         {
+            // If revision is empty, it means we are reading file in worktree.
             if (string.IsNullOrEmpty(revision))
-                return new ImageSource(null, 0);
+                return await FromFileAsync(Path.Combine(repo, file), decoder).ConfigureAwait(false);
 
             var emptyTreeHash = Models.EmptyTreeHash.Guess(revision);
             if (emptyTreeHash.Equals(revision, StringComparison.Ordinal))

From bf7892f80cde0ede2e1be40bbaf4947c079a58ee Mon Sep 17 00:00:00 2001
From: Paolo Ghibaudo <ghiboz@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:17:54 +0200
Subject: [PATCH 36/42] project: add .tss to .gitignore (#2520)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b8ed1295a9..5ca0482f9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.user
 *.suo
 *.code-workspace
+*.tss
 
 .DS_Store
 .DocumentRevisions-V100

From 9d01953fb6016a7041c53637cb9f1c8cc9f15569 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 9 Jul 2026 15:59:21 +0800
Subject: [PATCH 37/42] code_style: remove unnecessary spaces at end of line

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml          |  8 ++++----
 src/Resources/Locales/fr_FR.axaml          |  8 ++++----
 src/Resources/Locales/id_ID.axaml          |  4 ++--
 src/Resources/Locales/it_IT.axaml          |  2 +-
 src/Resources/Locales/ru_RU.axaml          |  8 ++++----
 src/Resources/Locales/zh_CN.axaml          |  4 ++--
 src/Resources/Styles.axaml                 | 20 ++++++++++----------
 src/ViewModels/DiffContext.cs              | 12 ++++++------
 src/Views/AIAssistant.axaml                |  6 +++---
 src/Views/AddRemote.axaml                  |  4 ++--
 src/Views/AddSubmodule.axaml               |  2 +-
 src/Views/AddToIgnore.axaml                |  2 +-
 src/Views/AddWorktree.axaml                |  2 +-
 src/Views/Apply.axaml                      |  4 ++--
 src/Views/ApplyStash.axaml                 |  2 +-
 src/Views/Archive.axaml                    |  2 +-
 src/Views/BlameCommandPalette.axaml        |  2 +-
 src/Views/BranchSelector.axaml             |  2 +-
 src/Views/BranchTree.axaml                 |  2 +-
 src/Views/ChangeCollectionView.axaml       |  8 ++++----
 src/Views/ChangeSubmoduleUrl.axaml         |  2 +-
 src/Views/CheckoutBranchFromStash.axaml    |  2 +-
 src/Views/CheckoutDetached.axaml           |  2 +-
 src/Views/CherryPick.axaml                 |  2 +-
 src/Views/Cleanup.axaml                    |  2 +-
 src/Views/Clone.axaml                      |  4 ++--
 src/Views/CommitDetailStandalone.axaml     |  2 +-
 src/Views/CommitMessageToolBox.axaml       |  4 ++--
 src/Views/Compare.axaml                    | 14 +++++++-------
 src/Views/CompareCommandPalette.axaml      |  2 +-
 src/Views/ConfirmEmptyCommit.axaml         |  2 +-
 src/Views/Conflict.axaml                   |  2 +-
 src/Views/CreateBranch.axaml               |  4 ++--
 src/Views/CreateTag.axaml                  |  2 +-
 src/Views/DealWithLocalChangesMethod.axaml |  2 +-
 src/Views/DeleteBranch.axaml               |  2 +-
 src/Views/DeleteRemote.axaml               |  2 +-
 src/Views/DeleteRepositoryNode.axaml       |  2 +-
 src/Views/DeleteSubmodule.axaml            |  2 +-
 src/Views/DeleteTag.axaml                  |  2 +-
 src/Views/DiffView.axaml                   |  4 ++--
 src/Views/Discard.axaml                    |  2 +-
 src/Views/DropStash.axaml                  |  2 +-
 src/Views/EditRemote.axaml                 |  2 +-
 src/Views/ExecuteCustomAction.axaml        |  2 +-
 src/Views/Fetch.axaml                      |  2 +-
 src/Views/FetchInto.axaml                  |  2 +-
 src/Views/GitFlowFinish.axaml              |  2 +-
 src/Views/GitFlowStart.axaml               |  4 ++--
 src/Views/GotoRevisionSelector.axaml       |  8 ++++----
 src/Views/Histories.axaml                  | 14 +++++++-------
 src/Views/Hotkeys.axaml                    |  4 ++--
 src/Views/InitGitFlow.axaml                |  2 +-
 src/Views/InteractiveRebase.axaml          | 10 +++++-----
 src/Views/LFSPrune.axaml                   |  2 +-
 src/Views/LauncherPage.axaml               |  2 +-
 src/Views/LauncherTabBar.axaml             |  2 +-
 src/Views/Merge.axaml                      |  6 +++---
 src/Views/MergeConflictEditor.axaml        |  4 ++--
 src/Views/MoveSubmodule.axaml              |  2 +-
 src/Views/Preferences.axaml                |  4 ++--
 src/Views/PruneRemote.axaml                |  2 +-
 src/Views/PruneWorktrees.axaml             |  2 +-
 src/Views/Pull.axaml                       |  2 +-
 src/Views/PushTag.axaml                    |  2 +-
 src/Views/Rebase.axaml                     |  2 +-
 src/Views/RemoveWorktree.axaml             |  2 +-
 src/Views/RenameBranch.axaml               |  2 +-
 src/Views/Repository.axaml                 |  4 ++--
 src/Views/Reset.axaml                      |  2 +-
 src/Views/ResetWithoutCheckout.axaml       |  2 +-
 src/Views/Revert.axaml                     |  2 +-
 src/Views/ScanRepositories.axaml           |  2 +-
 src/Views/SetSubmoduleBranch.axaml         |  2 +-
 src/Views/SetUpstream.axaml                |  2 +-
 src/Views/StashChanges.axaml               |  2 +-
 src/Views/Statistics.axaml                 |  2 +-
 src/Views/TextDiffView.axaml               |  2 +-
 src/Views/UpdateSubmodules.axaml           |  2 +-
 src/Views/ViewLogs.axaml                   |  4 ++--
 src/Views/Welcome.axaml                    |  4 ++--
 src/Views/WorkingCopy.axaml                |  2 +-
 82 files changed, 146 insertions(+), 146 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index f23542dd2d..c997f82219 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -210,8 +210,8 @@
   <x:String x:Key="Text.Compare.Commits.Tips" xml:space="preserve">Tips: You can cherry-pick selected commits if the other side is HEAD (using context menu).</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Repository Configure</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">COMMIT TEMPLATE</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Built-in parameters: 
-  
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Built-in parameters:
+
   ${branch_name} Current local branch name.
   ${files_num} Number of changed files
   ${files} Paths of changed files
@@ -222,8 +222,8 @@
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Template Name:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">CUSTOM ACTION</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Arguments:</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Built-in parameters: 
-  
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Built-in parameters:
+
   ${REPO} Repository's path
   ${REMOTE} Selected remote or selected branch's remote
   ${BRANCH} Selected branch, without ${REMOTE} part for remote branches
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index e68c729548..8227387c90 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -204,8 +204,8 @@
   <x:String x:Key="Text.Compare.Commits.Tips" xml:space="preserve">Astuce : vous pouvez cherry-pick les commits sélectionnés si l'autre côté est HEAD (via le menu contextuel).</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Configurer le dépôt</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">MODÈLE DE COMMIT</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Paramètres intégrés : 
-  
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Paramètres intégrés :
+
   ${branch_name} Nom de la branche locale actuelle.
   ${files_num} Nombre de fichiers modifiés
   ${files} Chemins des fichiers modifiés
@@ -216,8 +216,8 @@
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nom de modèle:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">ACTION PERSONNALISÉE</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Arguments :</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Paramètres intégrés : 
-  
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Paramètres intégrés :
+
   ${REPO} Chemin du dépôt
   ${REMOTE} Dépôt distant sélectionné ou dépôt distant de la branche sélectionnée
   ${BRANCH} Branche sélectionnée, sans la partie ${REMOTE} pour les branches distantes
diff --git a/src/Resources/Locales/id_ID.axaml b/src/Resources/Locales/id_ID.axaml
index 75bd5ccf7a..e5bf64e6e6 100644
--- a/src/Resources/Locales/id_ID.axaml
+++ b/src/Resources/Locales/id_ID.axaml
@@ -173,8 +173,8 @@
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nama Template:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">AKSI KUSTOM</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Argumen:</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Parameter bawaan: 
-  
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Parameter bawaan:
+
   ${REPO} Jalur repositori
   ${REMOTE} Remote yang dipilih atau remote dari branch yang dipilih
   ${BRANCH} Branch yang dipilih, tanpa bagian ${REMOTE} untuk remote branch
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index b18b821e6f..13122e41ce 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -196,7 +196,7 @@ ${pure_files:N} Come ${files:N}, ma senza cartelle</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">AZIONE PERSONALIZZATA</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Argomenti:</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Parametri integrati:
-  
+
   ${REPO} Percorso del repository
   ${REMOTE} Remoto selezionato o remoto del branch selezionato
   ${BRANCH} Branch selezionato, senza la parte ${REMOTE} per i branch remoti
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index a7ba06f7ad..ee438ac492 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -214,8 +214,8 @@
   <x:String x:Key="Text.Compare.Commits.Tips" xml:space="preserve">Подсказка: Если другая сторона является ГОЛОВОЙ (используя контекстное меню), вы можете использовать частично выбранные ревизии (cherry-pick).</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Настройка репозитория</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">ШАБЛОН РЕВИЗИИ</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Встроенные параметры: 
-  
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Встроенные параметры:
+
   ${branch_name} Имя текущей локальной ветки
   ${files_num} Количество изменённых файлов
   ${files} Пути изменённых файлов
@@ -226,8 +226,8 @@
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Название:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">ПОЛЬЗОВАТЕЛЬСКОЕ ДЕЙСТВИЕ</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Аргументы:</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Встроенные параметры: 
-  
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Встроенные параметры:
+
   ${REPO} Путь репозитория
   ${REMOTE} Выбранная удаённая ветка
   ${BRANCH} Выбранная ветка, без ${REMOTE} удалённых веток
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index d191175c22..cf27832e7b 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -215,7 +215,7 @@
   <x:String x:Key="Text.Configure" xml:space="preserve">仓库配置</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">提交信息模板</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">内置变量：
-  
+
   ${branch_name} 当前分支名
   ${files_num} 变更文件数量
   ${files} 变更文件路径列表
@@ -227,7 +227,7 @@
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">自定义操作</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">命令行参数 ：</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">内置变量：
-  
+
   ${REPO} 仓库路径
   ${REMOTE} 选中的远程仓库或选中分支所属的远程仓库
   ${BRANCH} 选中的分支，对于远程分支不包含远程名
diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 4aaf3b23c3..bcf19edebf 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -16,7 +16,7 @@
       <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="Red"/>
       <Color x:Key="SystemErrorTextColor">Red</Color>
     </Style.Resources>
-    
+
     <Setter Property="Background" Value="{DynamicResource Brush.Window}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource Brush.WindowBorder}"/>
     <Setter Property="SystemDecorations" Value="Full"/>
@@ -48,7 +48,7 @@
             </VisualLayerManager>
           </Border>
         </Border>
-      </ControlTemplate>        
+      </ControlTemplate>
     </Setter>
   </Style>
 
@@ -403,11 +403,11 @@
     <Style Selector="^ /template/ RepeatButton:pointerover > Path">
       <Setter Property="Fill" Value="{DynamicResource Brush.FG1}" />
     </Style>
-    
+
     <Style Selector="^ /template/ Thumb:pointerover">
       <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
     </Style>
-    
+
     <Style Selector="^[IsExpanded=False]">
       <Style Selector="^ /template/ RepeatButton">
         <Setter Property="IsVisible" Value="False" />
@@ -426,7 +426,7 @@
   </Style>
 
   <Style Selector="ScrollViewer.static_scrollbar">
-    <Setter Property="AllowAutoHide" Value="False"/>    
+    <Setter Property="AllowAutoHide" Value="False"/>
     <Style Selector="^ /template/ ScrollContentPresenter#PART_ContentPresenter">
       <Setter Property="Grid.RowSpan" Value="1"/>
       <Setter Property="Grid.ColumnSpan" Value="1"/>
@@ -1016,7 +1016,7 @@
         <Border/>
       </FocusAdornerTemplate>
     </Setter>
-    
+
     <Setter Property="VerticalAlignment" Value="Center"/>
     <Setter Property="Template">
       <ControlTemplate>
@@ -1051,7 +1051,7 @@
     </Style>
     <Style Selector="^:focus-visible:checked /template/ Path#Icon">
       <Setter Property="Fill" Value="White"/>
-    </Style> 
+    </Style>
   </Style>
 
   <Style Selector="RadioButton">
@@ -1060,9 +1060,9 @@
         <Border/>
       </FocusAdornerTemplate>
     </Setter>
-    
+
     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
-    
+
     <Setter Property="Template">
       <ControlTemplate>
         <Grid ColumnDefinitions="16,*" Background="Transparent">
@@ -1362,7 +1362,7 @@
   <Style Selector="NumericUpDown">
     <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
     <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
-    
+
     <Style Selector="^ /template/ ButtonSpinner#PART_Spinner">
       <Setter Property="MinHeight" Value="0"/>
       <Setter Property="Height" Value="28"/>
diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index b2e28d2859..27eb93b8dd 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -167,7 +167,7 @@ private void LoadContent()
                 }
                 else if (latest.IsSubmoduleChange)
                 {
-                    rs = await CreateSubmoduleDiffAsync(latest).ConfigureAwait(false);
+                    rs = await CreateSubmoduleDiffAsync(latest.OldHash, latest.NewHash).ConfigureAwait(false);
                 }
                 else if (IsEmptyFileHash(latest.OldHash) || IsEmptyFileHash(latest.NewHash))
                 {
@@ -276,19 +276,19 @@ private void LoadContent()
             return binaryDiff;
         }
 
-        private async Task<Models.SubmoduleDiff> CreateSubmoduleDiffAsync(Models.DiffResult result)
+        private async Task<Models.SubmoduleDiff> CreateSubmoduleDiffAsync(string oldRevision, string newRevision)
         {
             var submoduleDiff = new Models.SubmoduleDiff();
             var submoduleRoot = $"{_repo}/{_option.Path}".Replace('\\', '/').TrimEnd('/');
             submoduleDiff.FullPath = submoduleRoot;
 
-            if (IsValidSubmoduleHash(result.OldHash))
-                submoduleDiff.Old = await new Commands.QuerySubmoduleRevision(submoduleRoot, result.OldHash)
+            if (IsValidSubmoduleHash(oldRevision))
+                submoduleDiff.Old = await new Commands.QuerySubmoduleRevision(submoduleRoot, oldRevision)
                     .GetResultAsync()
                     .ConfigureAwait(false);
 
-            if (IsValidSubmoduleHash(result.NewHash))
-                submoduleDiff.New = await new Commands.QuerySubmoduleRevision(submoduleRoot, result.NewHash)
+            if (IsValidSubmoduleHash(newRevision))
+                submoduleDiff.New = await new Commands.QuerySubmoduleRevision(submoduleRoot, newRevision)
                     .GetResultAsync()
                     .ConfigureAwait(false);
 
diff --git a/src/Views/AIAssistant.axaml b/src/Views/AIAssistant.axaml
index 4806125074..9c1db462b1 100644
--- a/src/Views/AIAssistant.axaml
+++ b/src/Views/AIAssistant.axaml
@@ -49,7 +49,7 @@
       <TextBlock Grid.Column="0"
                  Classes="group_header_label"
                  Text="{DynamicResource Text.AIAssistant.Model}"/>
-      
+
       <ComboBox Grid.Column="1"
                 Height="28"
                 Margin="6,0" Padding="4,0"
@@ -59,7 +59,7 @@
                 ItemsSource="{Binding AvailableModels, Mode=OneWay}"
                 SelectedItem="{Binding CurrentModel, Mode=TwoWay}"
                 SelectionChanged="OnModelChanged"/>
-      
+
       <v:LoadingIcon Grid.Column="2"
                      Width="14" Height="14"
                      IsVisible="{Binding IsGenerating}"/>
@@ -71,7 +71,7 @@
               Content="{DynamicResource Text.AIAssistant.Use}"
               IsEnabled="{Binding Response, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
               Click="OnUseClicked"/>
-      
+
       <Button Grid.Column="4"
               Classes="flat"
               Height="28"
diff --git a/src/Views/AddRemote.axaml b/src/Views/AddRemote.axaml
index a53cfbe1f7..d78b025a7d 100644
--- a/src/Views/AddRemote.axaml
+++ b/src/Views/AddRemote.axaml
@@ -12,13 +12,13 @@
       <Path Width="16" Height="16"
             Margin="0,2,0,0"
             Data="{StaticResource Icons.Remote.Add}"/>
-      
+
       <TextBlock FontSize="18"
                  Margin="8,0,0,0"
                  Classes="bold"
                  Text="{DynamicResource Text.Remote.AddTitle}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/AddSubmodule.axaml b/src/Views/AddSubmodule.axaml
index c4281d3a04..0d5f442ef9 100644
--- a/src/Views/AddSubmodule.axaml
+++ b/src/Views/AddSubmodule.axaml
@@ -17,7 +17,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Submodule.Add}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/AddToIgnore.axaml b/src/Views/AddToIgnore.axaml
index 2e9d283322..19ac520290 100644
--- a/src/Views/AddToIgnore.axaml
+++ b/src/Views/AddToIgnore.axaml
@@ -17,7 +17,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.AddToIgnore}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/AddWorktree.axaml b/src/Views/AddWorktree.axaml
index 36d5c8c0df..4f047f489a 100644
--- a/src/Views/AddWorktree.axaml
+++ b/src/Views/AddWorktree.axaml
@@ -18,7 +18,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.AddWorktree}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,Auto" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/Apply.axaml b/src/Views/Apply.axaml
index bc199a1697..afa6cf1a0e 100644
--- a/src/Views/Apply.axaml
+++ b/src/Views/Apply.axaml
@@ -30,7 +30,7 @@
                      IsChecked="{Binding FromClipboard, Mode=TwoWay}"
                      Margin="18,0,0,0"/>
       </StackPanel>
-      
+
       <TextBox Grid.Row="1" Grid.Column="1"
                x:Name="TxtPatchFile"
                Height="28"
@@ -50,7 +50,7 @@
             <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
           </Button>
         </TextBox.InnerRightContent>
-      </TextBox>     
+      </TextBox>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/ApplyStash.axaml b/src/Views/ApplyStash.axaml
index 459bd29dde..c3a6f0f24e 100644
--- a/src/Views/ApplyStash.axaml
+++ b/src/Views/ApplyStash.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.ApplyStash}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,8,0" RowDefinitions="32,32,32" ColumnDefinitions="100,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/Archive.axaml b/src/Views/Archive.axaml
index c1a368a32d..3e2b599913 100644
--- a/src/Views/Archive.axaml
+++ b/src/Views/Archive.axaml
@@ -18,7 +18,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Archive.Title}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/BlameCommandPalette.axaml b/src/Views/BlameCommandPalette.axaml
index 8a99940c51..efb2000f8b 100644
--- a/src/Views/BlameCommandPalette.axaml
+++ b/src/Views/BlameCommandPalette.axaml
@@ -56,7 +56,7 @@
                Text="{DynamicResource Text.CommandPalette.RevisionFiles}"
                FontWeight="Bold"
                Foreground="{DynamicResource Brush.FG2}"/>
-    
+
     <v:ListBoxEx Grid.Row="2"
                  x:Name="FileListBox"
                  MaxHeight="360"
diff --git a/src/Views/BranchSelector.axaml b/src/Views/BranchSelector.axaml
index 8eab6254ee..af8b25eb56 100644
--- a/src/Views/BranchSelector.axaml
+++ b/src/Views/BranchSelector.axaml
@@ -176,7 +176,7 @@
 
       <Style Selector="^:disabled">
         <Setter Property="Opacity" Value="0.6"/>
-        
+
         <Style Selector="^ /template/ Border#PART_Background">
           <Setter Property="Background" Value="Transparent" />
           <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}"/>
diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
index d850ecc7ae..98ded57a19 100644
--- a/src/Views/BranchTree.axaml
+++ b/src/Views/BranchTree.axaml
@@ -112,7 +112,7 @@
               </StackPanel>
             </DataTemplate>
           </Border.DataTemplates>
-          
+
           <Grid Height="24"
                 Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
                 ColumnDefinitions="16,*">
diff --git a/src/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml
index 8d8f56bc32..be9143d1bb 100644
--- a/src/Views/ChangeCollectionView.axaml
+++ b/src/Views/ChangeCollectionView.axaml
@@ -50,7 +50,7 @@
                                               IsChecked="{Binding IsExpanded, Mode=OneWay}"
                                               IsVisible="{Binding IsFolder}"/>
               </Border>
-              
+
               <ToggleButton Classes="folder"
                             Focusable="False"
                             Width="14" Height="14"
@@ -70,7 +70,7 @@
                          FontWeight="Bold"
                          Margin="4,0,0,0"
                          IsVisible="{Binding ShowConflictMarker}"/>
-              
+
               <TextBlock Text="{Binding DisplayName, Mode=OneWay}"
                          Margin="4,0,0,0"/>
             </StackPanel>
@@ -101,7 +101,7 @@
                          Foreground="DarkOrange"
                          FontWeight="Bold"
                          Margin="4,0,0,0" IsVisible="{Binding IsConflicted}"/>
-              
+
               <TextBlock Text="{Binding Path, Converter={x:Static c:PathConverters.PureFileName}}"
                          Margin="4,0,0,0"/>
 
@@ -137,7 +137,7 @@
                          FontWeight="Bold"
                          Margin="4,0,0,0"
                          IsVisible="{Binding IsConflicted}"/>
-              
+
               <TextBlock Margin="4,0,0,0"
                          Text="{Binding Path}"/>
             </StackPanel>
diff --git a/src/Views/ChangeSubmoduleUrl.axaml b/src/Views/ChangeSubmoduleUrl.axaml
index a1d6cef026..bf3d7b3db2 100644
--- a/src/Views/ChangeSubmoduleUrl.axaml
+++ b/src/Views/ChangeSubmoduleUrl.axaml
@@ -17,7 +17,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.ChangeSubmoduleUrl}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/CheckoutBranchFromStash.axaml b/src/Views/CheckoutBranchFromStash.axaml
index 0e03089686..037410af52 100644
--- a/src/Views/CheckoutBranchFromStash.axaml
+++ b/src/Views/CheckoutBranchFromStash.axaml
@@ -17,7 +17,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.CheckoutBranchFromStash}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,8,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/CheckoutDetached.axaml b/src/Views/CheckoutDetached.axaml
index 9780648010..0c98c4b00c 100644
--- a/src/Views/CheckoutDetached.axaml
+++ b/src/Views/CheckoutDetached.axaml
@@ -25,7 +25,7 @@
         <ColumnDefinition Width="Auto" MinWidth="140"/>
         <ColumnDefinition Width="*"/>
       </Grid.ColumnDefinitions>
-      
+
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/CherryPick.axaml b/src/Views/CherryPick.axaml
index 9754c11dbf..85cd19514c 100644
--- a/src/Views/CherryPick.axaml
+++ b/src/Views/CherryPick.axaml
@@ -18,7 +18,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.CherryPick}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="Auto,Auto,32,32" ColumnDefinitions="100,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/Cleanup.axaml b/src/Views/Cleanup.axaml
index 78c42ac015..18dbb9eea4 100644
--- a/src/Views/Cleanup.axaml
+++ b/src/Views/Cleanup.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Repository.Clean}"/>
     </StackPanel>
-    
+
     <TextBlock Text="{DynamicResource Text.Repository.CleanTips}"
                Margin="0,16,0,0"
                HorizontalAlignment="Center"/>
diff --git a/src/Views/Clone.axaml b/src/Views/Clone.axaml
index 89e3ee4606..f77e5c165e 100644
--- a/src/Views/Clone.axaml
+++ b/src/Views/Clone.axaml
@@ -35,7 +35,7 @@
                 Data="{StaticResource Icons.Link}"
                 Fill="{DynamicResource Brush.FG1}"/>
         </TextBox.InnerLeftContent>
-        
+
         <TextBox.InnerRightContent>
           <v:RemoteProtocolSwitcher Url="{Binding Remote, Mode=TwoWay}"/>
         </TextBox.InnerRightContent>
@@ -59,7 +59,7 @@
                 Data="{StaticResource Icons.Password}"
                 Fill="{DynamicResource Brush.FG1}"/>
         </TextBox.InnerLeftContent>
-        
+
         <TextBox.InnerRightContent>
           <Button Classes="icon_button" Width="28" Height="28" Click="SelectSSHKey">
             <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
diff --git a/src/Views/CommitDetailStandalone.axaml b/src/Views/CommitDetailStandalone.axaml
index 8b085e1274..b43ca95829 100644
--- a/src/Views/CommitDetailStandalone.axaml
+++ b/src/Views/CommitDetailStandalone.axaml
@@ -19,7 +19,7 @@
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
               DoubleTapped="MaximizeOrRestoreWindow"
               PointerPressed="BeginMoveWindow"/>
-      
+
       <Path Width="12" Height="12"
             Margin="10,0,0,0"
             HorizontalAlignment="Left"
diff --git a/src/Views/CommitMessageToolBox.axaml b/src/Views/CommitMessageToolBox.axaml
index dbdadafc0f..bd7d5a6c73 100644
--- a/src/Views/CommitMessageToolBox.axaml
+++ b/src/Views/CommitMessageToolBox.axaml
@@ -138,13 +138,13 @@
             <TextBlock Margin="8,0,0,0"
                        FontSize="11"
                        Text="{Binding #Editor.Column, Mode=OneWay}"/>
-            
+
             <Rectangle Width="1"
                        Margin="8,0"
                        Fill="{DynamicResource Brush.Border2}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Stretch"/>
-            
+
             <TextBlock Classes="info_label"
                        FontSize="13"
                        HorizontalAlignment="Left"
diff --git a/src/Views/Compare.axaml b/src/Views/Compare.axaml
index 1349ff4529..3f340d4954 100644
--- a/src/Views/Compare.axaml
+++ b/src/Views/Compare.axaml
@@ -51,7 +51,7 @@
               <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
                 <StackPanel Orientation="Horizontal">
                   <Path Width="12" Height="12" Margin="4,2,0,0" Data="{StaticResource Icons.Check}" Fill="White" IsVisible="{Binding BaseHead.IsCurrentHead, Mode=OneWay}"/>
-                  <TextBlock Text="{Binding BaseName}" Margin="4,0" Foreground="#FFF2F2F2"/>        
+                  <TextBlock Text="{Binding BaseName}" Margin="4,0" Foreground="#FFF2F2F2"/>
                 </StackPanel>
               </Border>
               <TextBlock Grid.Column="3"
@@ -80,7 +80,7 @@
               <Binding Path="IsLoadingPickableCommits" Converter="{x:Static BoolConverters.Not}"/>
             </MultiBinding>
           </Button.IsEnabled>
-          
+
           <Path Width="16" Height="16" Data="{DynamicResource Icons.Compare}"/>
         </Button>
 
@@ -133,8 +133,8 @@
           <TextBlock Margin="16,0" Text="{DynamicResource Text.Compare.Commits}" FontWeight="Bold"/>
         </RadioButton>
       </StackPanel>
-    </Border>    
-    
+    </Border>
+
     <!-- Contents -->
     <Grid Grid.Row="3" Margin="8">
       <!-- Changes -->
@@ -236,7 +236,7 @@
           <TextBlock Margin="6,0"
                      FontWeight="Bold"
                      Text="{DynamicResource Text.Compare.Commits.LeftOnly}"/>
-          
+
           <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" CornerRadius="4">
             <StackPanel Orientation="Horizontal">
               <Path Width="12" Height="12" Margin="4,2,0,0" Data="{StaticResource Icons.Check}" IsVisible="{Binding BaseHead.IsCurrentHead, Mode=OneWay}"/>
@@ -244,7 +244,7 @@
             </StackPanel>
           </Border>
         </StackPanel>
-        
+
         <ListBox Grid.Row="1"
                  Margin="0,8,0,0"
                  Padding="4"
@@ -375,7 +375,7 @@
                 Margin="2,0,0,0"
                 Data="{StaticResource Icons.Info}"
                 Fill="{DynamicResource Brush.FG2}"/>
-          
+
           <TextBlock Margin="4,0,0,0"
                      Foreground="{DynamicResource Brush.FG2}"
                      Text="{DynamicResource Text.Compare.Commits.Tips}"/>
diff --git a/src/Views/CompareCommandPalette.axaml b/src/Views/CompareCommandPalette.axaml
index edd031b16f..e8b32115cc 100644
--- a/src/Views/CompareCommandPalette.axaml
+++ b/src/Views/CompareCommandPalette.axaml
@@ -32,7 +32,7 @@
                   Margin="4,0,0,0" Padding="4,0">
             <StackPanel Orientation="Horizontal">
               <TextBlock Text="{DynamicResource Text.Compare}" Foreground="Black" FontWeight="Bold"/>
-              
+
               <ContentControl Content="{Binding BasedOn}" Margin="4,0,0,0" MaxWidth="100">
                 <ContentControl.DataTemplates>
                   <DataTemplate DataType="m:Branch">
diff --git a/src/Views/ConfirmEmptyCommit.axaml b/src/Views/ConfirmEmptyCommit.axaml
index 7ed1d12c32..43b5ae2544 100644
--- a/src/Views/ConfirmEmptyCommit.axaml
+++ b/src/Views/ConfirmEmptyCommit.axaml
@@ -50,7 +50,7 @@
               Content="{DynamicResource Text.ConfirmEmptyCommit.StageSelectedThenCommit}"
               HorizontalContentAlignment="Center"
               VerticalContentAlignment="Center"/>
-      
+
       <Button Classes="flat"
               x:Name="BtnStageAllAndCommit"
               Height="30"
diff --git a/src/Views/Conflict.axaml b/src/Views/Conflict.axaml
index d61c49a54e..f2702a1f16 100644
--- a/src/Views/Conflict.axaml
+++ b/src/Views/Conflict.axaml
@@ -137,7 +137,7 @@
                 </Style>
               </Style>
             </SplitButton.Styles>
-            
+
             <SplitButton.Flyout>
               <MenuFlyout Placement="BottomEdgeAlignedLeft">
                 <MenuItem Header="{DynamicResource Text.WorkingCopy.Conflicts.MergeExternal}"
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index 96f1448c71..670a6ff9ac 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -19,13 +19,13 @@
                  Classes="bold"
                  Text="{DynamicResource Text.CreateBranch.Title}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto,Auto,Auto">
       <Grid.ColumnDefinitions>
         <ColumnDefinition Width="Auto" MinWidth="140"/>
         <ColumnDefinition Width="*"/>
       </Grid.ColumnDefinitions>
-      
+
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/CreateTag.axaml b/src/Views/CreateTag.axaml
index 9268423356..eefb54f6be 100644
--- a/src/Views/CreateTag.axaml
+++ b/src/Views/CreateTag.axaml
@@ -19,7 +19,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.CreateTag.Title}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,8,0" RowDefinitions="32,32,32,Auto,Auto,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/DealWithLocalChangesMethod.axaml b/src/Views/DealWithLocalChangesMethod.axaml
index a4b8c0aa79..9d35cb1922 100644
--- a/src/Views/DealWithLocalChangesMethod.axaml
+++ b/src/Views/DealWithLocalChangesMethod.axaml
@@ -6,7 +6,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.DealWithLocalChangesMethod"
              x:Name="ThisControl">
-  <StackPanel Orientation="Vertical" Margin="0,4,0,2">        
+  <StackPanel Orientation="Vertical" Margin="0,4,0,2">
     <RadioButton Content="{DynamicResource Text.DealWithLocalChanges.DoNothing}"
                  x:Name="RadioDoNothing"
                  Height="24"
diff --git a/src/Views/DeleteBranch.axaml b/src/Views/DeleteBranch.axaml
index e1365d187b..3cd83e73d7 100644
--- a/src/Views/DeleteBranch.axaml
+++ b/src/Views/DeleteBranch.axaml
@@ -53,7 +53,7 @@
                      Text="{DynamicResource Text.DeleteBranch.IsRemoteTip}"
                      Foreground="{DynamicResource Brush.FG2}"
                      FontStyle="Italic"/>
-        </StackPanel>        
+        </StackPanel>
       </Grid>
     </Grid>
   </StackPanel>
diff --git a/src/Views/DeleteRemote.axaml b/src/Views/DeleteRemote.axaml
index ea5c39b80f..f8ab1033d6 100644
--- a/src/Views/DeleteRemote.axaml
+++ b/src/Views/DeleteRemote.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.DeleteRemote}"/>
     </StackPanel>
-    
+
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
       <TextBlock Text="{DynamicResource Text.DeleteRemote.Remote}"/>
       <Path Width="14" Height="14" Margin="8,2,8,0" Data="{StaticResource Icons.Remote}"/>
diff --git a/src/Views/DeleteRepositoryNode.axaml b/src/Views/DeleteRepositoryNode.axaml
index 15132a9f3c..5971e250d5 100644
--- a/src/Views/DeleteRepositoryNode.axaml
+++ b/src/Views/DeleteRepositoryNode.axaml
@@ -21,7 +21,7 @@
                  Text="{DynamicResource Text.DeleteRepositoryNode.TitleForRepository}"
                  IsVisible="{Binding Node.IsRepository}"/>
     </StackPanel>
-    
+
 
     <Grid Margin="0,16,8,0" RowDefinitions="32,Auto,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
diff --git a/src/Views/DeleteSubmodule.axaml b/src/Views/DeleteSubmodule.axaml
index 8f0d85be89..d2f728a8ae 100644
--- a/src/Views/DeleteSubmodule.axaml
+++ b/src/Views/DeleteSubmodule.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.DeleteSubmodule}"/>
     </StackPanel>
-    
+
     <StackPanel Orientation="Horizontal" Margin="0,16,0,0" Height="28" HorizontalAlignment="Center">
       <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/DeleteTag.axaml b/src/Views/DeleteTag.axaml
index 4efa677112..f158f85649 100644
--- a/src/Views/DeleteTag.axaml
+++ b/src/Views/DeleteTag.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.DeleteTag}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index a3a905e084..baf10f9b27 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -25,7 +25,7 @@
                             FontSize="10"
                             OldMode="{Binding OldMode, Mode=OneWay}"
                             NewMode="{Binding NewMode, Mode=OneWay}"/>
-          
+
           <!-- Line Changes Summary -->
           <ContentControl Grid.Column="2" Margin="4,0,0,0" Content="{Binding Content, Mode=OneWay}" IsVisible="{Binding IsTextDiff}">
             <ContentControl.DataTemplates>
@@ -338,7 +338,7 @@
                       </ContentControl.DataTemplates>
                     </ContentControl>
                   </Border>
-                  
+
                   <Button Classes="flat"
                           Margin="0,8"
                           HorizontalAlignment="Center"
diff --git a/src/Views/Discard.axaml b/src/Views/Discard.axaml
index 33ea6d0238..ca51b66d11 100644
--- a/src/Views/Discard.axaml
+++ b/src/Views/Discard.axaml
@@ -60,7 +60,7 @@
                        Margin="0,0,8,0"
                        HorizontalAlignment="Right"
                        Text="{DynamicResource Text.Discard.Changes}"/>
-            
+
             <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
               <Path Width="12" Height="12" Data="{StaticResource Icons.File}"/>
               <TextBlock Text="{Binding Path}" Margin="4,0,0,0"/>
diff --git a/src/Views/DropStash.axaml b/src/Views/DropStash.axaml
index 63759d55a7..ec8c13bdb2 100644
--- a/src/Views/DropStash.axaml
+++ b/src/Views/DropStash.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.StashDropConfirm}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,8,0" Height="28" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/EditRemote.axaml b/src/Views/EditRemote.axaml
index dd7fd34aa0..fa0c31f4b3 100644
--- a/src/Views/EditRemote.axaml
+++ b/src/Views/EditRemote.axaml
@@ -82,7 +82,7 @@
               <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
             </Button>
           </TextBox.InnerRightContent>
-        </TextBox>        
+        </TextBox>
       </Border>
     </Grid>
   </StackPanel>
diff --git a/src/Views/ExecuteCustomAction.axaml b/src/Views/ExecuteCustomAction.axaml
index e2b938d855..6769f94814 100644
--- a/src/Views/ExecuteCustomAction.axaml
+++ b/src/Views/ExecuteCustomAction.axaml
@@ -150,7 +150,7 @@
                        IsVisible="{Binding Description, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
           </Grid>
         </DataTemplate>
-      
+
         <DataTemplate DataType="vm:CustomActionControlBranchSelector">
           <Grid RowDefinitions="32,Auto" ColumnDefinitions="150,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
diff --git a/src/Views/Fetch.axaml b/src/Views/Fetch.axaml
index 1a60f3eb7d..c9de0e6092 100644
--- a/src/Views/Fetch.axaml
+++ b/src/Views/Fetch.axaml
@@ -17,7 +17,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Fetch.Title}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/FetchInto.axaml b/src/Views/FetchInto.axaml
index 0ee6aaf6b2..29f5025478 100644
--- a/src/Views/FetchInto.axaml
+++ b/src/Views/FetchInto.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Fetch.Title}"/>
     </StackPanel>
-    
+
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
       <Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
       <TextBlock Text="{Binding Upstream.FriendlyName}" Margin="8,0,0,0"/>
diff --git a/src/Views/GitFlowFinish.axaml b/src/Views/GitFlowFinish.axaml
index 542caecfa2..879d88d854 100644
--- a/src/Views/GitFlowFinish.axaml
+++ b/src/Views/GitFlowFinish.axaml
@@ -26,7 +26,7 @@
                  Text="{DynamicResource Text.GitFlow.FinishHotfix}"
                  IsVisible="{Binding Type, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:GitFlowBranchType.Hotfix}}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32" ColumnDefinitions="150,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/GitFlowStart.axaml b/src/Views/GitFlowStart.axaml
index 702d32b4e0..6473317412 100644
--- a/src/Views/GitFlowStart.axaml
+++ b/src/Views/GitFlowStart.axaml
@@ -27,7 +27,7 @@
                  Text="{DynamicResource Text.GitFlow.StartHotfixTitle}"
                  IsVisible="{Binding Type, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:GitFlowBranchType.Hotfix}}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
@@ -40,7 +40,7 @@
                    VerticalAlignment="Center"
                    Text="{Binding StartPoint, Mode=OneWay}"/>
       </StackPanel>
-      
+
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
diff --git a/src/Views/GotoRevisionSelector.axaml b/src/Views/GotoRevisionSelector.axaml
index d4cfcf7733..d29d400906 100644
--- a/src/Views/GotoRevisionSelector.axaml
+++ b/src/Views/GotoRevisionSelector.axaml
@@ -35,7 +35,7 @@
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
-    
+
     <v:ListBoxEx Grid.Row="1"
                  x:Name="RevisionList"
                  Focusable="True"
@@ -71,17 +71,17 @@
                 <ColumnDefinition Width="Auto" SharedSizeGroup="CommitSHAColumn"/>
                 <ColumnDefinition Width="Auto" SharedSizeGroup="CommitTimeColumn"/>
               </Grid.ColumnDefinitions>
-              
+
               <v:Avatar Grid.Column="0"
                         Width="16" Height="16"
                         HorizontalAlignment="Center" VerticalAlignment="Center"
                         IsHitTestVisible="False"
                         User="{Binding Author}"/>
-              
+
               <Border Grid.Column="1" Margin="2,0,0,0" ClipToBounds="True">
                 <TextBlock Text="{Binding Subject}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
               </Border>
-              
+
               <TextBlock Grid.Column="2"
                          Margin="4,0,0,0"
                          Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index d807781a49..9555d7e21f 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -23,7 +23,7 @@
       <ColumnDefinition Width="{Binding RightArea, Mode=TwoWay}" MinWidth="100"/>
     </v:HistoriesLayout.ColumnDefinitions>
 
-    <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">      
+    <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
       <v:HistoriesCommitList x:Name="CommitListContainer"
                              Classes="static_scrollbar"
                              ScrollViewer.AllowAutoHide="False"
@@ -54,7 +54,7 @@
               <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
             </Style>
           </Style>
-          
+
           <Style Selector="DataGridColumnHeader">
             <Setter Property="MinHeight" Value="24"/>
             <Setter Property="Background" Value="Transparent"/>
@@ -233,14 +233,14 @@
           </DataGridTemplateColumn>
         </DataGrid.Columns>
       </v:HistoriesCommitList>
-      
+
       <Border Background="Transparent"
               Height="24"
               HorizontalAlignment="Stretch" VerticalAlignment="Top"
               PointerMoved="OnCommitListHeaderPointerMoved"
               PointerPressed="OnCommitListHeaderPointerPressed"
               PointerReleased="OnCommitListHeaderPointerReleased"
-              ContextRequested="OnCommitListHeaderContextRequested"/>              
+              ContextRequested="OnCommitListHeaderContextRequested"/>
 
       <v:CommitGraph x:Name="CommitGraph"
                      Margin="0,24,0,0"
@@ -316,7 +316,7 @@
                 </TabItem>
               </TabControl>
           </DataTemplate>
-          
+
           <DataTemplate DataType="vm:CommitDetail">
             <v:CommitDetail IsDetailsPanelExpanded="{Binding #ThisControl.IsDetailsPanelExpanded, Mode=OneWay}"/>
           </DataTemplate>
@@ -359,7 +359,7 @@
                 <StackPanel Orientation="Vertical"
                             HorizontalAlignment="Center" VerticalAlignment="Center"
                             IsVisible="{Binding #ThisControl.IsDetailsPanelExpanded, Mode=OneWay}">
-                  
+
                   <Path Width="128" Height="128"
                         Data="{StaticResource Icons.Detail}"
                         HorizontalAlignment="Center"
@@ -410,7 +410,7 @@
           </ToolTip.Tip>
           <Path Width="15" Height="15" Margin="0,1,0,0" Data="{StaticResource Icons.OpenAsStandalone}"/>
         </Button>
-        
+
         <ToggleButton Classes="line_path"
                       Width="28" Height="28"
                       Padding="0"
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index e2de7556b1..d1045cad97 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -134,10 +134,10 @@
 
           <TextBlock Grid.Row="14" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+J, macOS=⌘+J}"/>
           <TextBlock Grid.Row="14" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ToggleHistoriesDetailPanel}" />
-          
+
           <TextBlock Grid.Row="15" Grid.Column="0" Classes="bold" Text="{OnPlatform Alt+Down, macOS=⌥+Down}"/>
           <TextBlock Grid.Row="15" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.GoToParent}" />
-          
+
           <TextBlock Grid.Row="16" Grid.Column="0" Classes="bold" Text="{OnPlatform Alt+Up, macOS=⌥+Up}"/>
           <TextBlock Grid.Row="16" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.GoToChild}" />
 
diff --git a/src/Views/InitGitFlow.axaml b/src/Views/InitGitFlow.axaml
index ad21130496..916262c7a0 100644
--- a/src/Views/InitGitFlow.axaml
+++ b/src/Views/InitGitFlow.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.GitFlow.Init}"/>
     </StackPanel>
-    
+
     <Grid Margin="8,16,0,0" RowDefinitions="32,32,8,32,32,32,32" ColumnDefinitions="Auto,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index 14a3f53a34..da9019b79c 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -65,7 +65,7 @@
 
         <Path Width="14" Height="14" Data="{StaticResource Icons.Info}"/>
       </Border>
-      
+
       <Button Grid.Column="2" Width="0" Height="0" Click="OnMoveSelectedUp" HotKey="{OnPlatform Ctrl+Up, macOS=⌘+Up}"/>
       <Button Grid.Column="3" Width="0" Height="0" Click="OnMoveSelectedDown" HotKey="{OnPlatform Ctrl+Down, macOS=⌘+Down}"/>
     </Grid>
@@ -134,7 +134,7 @@
                            FontFamily="{DynamicResource Fonts.Monospace}"
                            Text="{Binding OriginalOrder, StringFormat='#{0}'}"
                            HorizontalAlignment="Center"/>
-                
+
                 <!-- Action -->
                 <Button Grid.Column="1" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnShowActionsDropdownMenu">
                   <StackPanel Orientation="Horizontal">
@@ -247,7 +247,7 @@
                            Text="{Binding Value, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Histories.Selected'}"/>
               </StackPanel>
             </DataTemplate>
-            
+
             <DataTemplate DataType="vm:CommitDetail">
               <Grid>
                 <v:CommitDetail IsDetailsPanelExpanded="True"/>
@@ -273,13 +273,13 @@
         <CheckBox Content="{DynamicResource Text.InteractiveRebase.AutoStash}"
                   VerticalAlignment="Center"
                   IsChecked="{Binding AutoStash, Mode=TwoWay}"/>
-        
+
         <CheckBox Margin="16,0,0,0"
                   Content="{DynamicResource Text.InteractiveRebase.NoVerify}"
                   VerticalAlignment="Center"
                   IsChecked="{Binding NoVerify, Mode=TwoWay}"/>
       </StackPanel>
-      
+
       <Button Grid.Column="1" Classes="flat primary" MinWidth="80" Content="{DynamicResource Text.Start}" Click="OnStartJobs"/>
       <Button Grid.Column="2" Classes="flat" Margin="8,0,0,0" MinWidth="80" Content="{DynamicResource Text.Cancel}" Click="CloseWindow"/>
     </Grid>
diff --git a/src/Views/LFSPrune.axaml b/src/Views/LFSPrune.axaml
index 676479d729..0b601cd438 100644
--- a/src/Views/LFSPrune.axaml
+++ b/src/Views/LFSPrune.axaml
@@ -14,7 +14,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.GitLFS.Prune}"/>
     </StackPanel>
-    
+
     <TextBlock Text="{DynamicResource Text.GitLFS.Prune.Tips}"
                Margin="8,16,8,0"
                HorizontalAlignment="Center"
diff --git a/src/Views/LauncherPage.axaml b/src/Views/LauncherPage.axaml
index 767d97dca3..0a2e3144eb 100644
--- a/src/Views/LauncherPage.axaml
+++ b/src/Views/LauncherPage.axaml
@@ -31,7 +31,7 @@
 
     <!-- Body -->
     <Border Grid.Row="1">
-      <ContentControl Content="{Binding Data}">        
+      <ContentControl Content="{Binding Data}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="vm:Welcome">
             <v:Welcome/>
diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index 38f0b6c8b3..76b4f7ddf7 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -52,7 +52,7 @@
               <Setter Property="Opacity" Value="1"/>
             </Style>
           </ListBox.Styles>
-          
+
           <ListBox.ItemsPanel>
             <ItemsPanelTemplate>
               <StackPanel Orientation="Horizontal" Height="30"/>
diff --git a/src/Views/Merge.axaml b/src/Views/Merge.axaml
index be31f6534d..48cc9b7111 100644
--- a/src/Views/Merge.axaml
+++ b/src/Views/Merge.axaml
@@ -19,7 +19,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Merge}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,Auto" ColumnDefinitions="130,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
@@ -138,14 +138,14 @@
                      VerticalAlignment="Center"
                      Text="{DynamicResource Text.Merge.Test.NoConflicts}"/>
         </StackPanel>
-        
+
         <StackPanel Orientation="Horizontal"
                     VerticalAlignment="Center"
                     IsVisible="{Binding TestingState, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static vm:MergeTestingState.WillCauseConflicts}}">
           <Path Width="14" Height="14"
                 Data="{DynamicResource Icons.Error}"
                 Fill="Goldenrod"/>
-          
+
           <TextBlock Margin="8,0,0,0"
                      VerticalAlignment="Center"
                      Text="{DynamicResource Text.Merge.Test.WillCauseConflicts}"/>
diff --git a/src/Views/MergeConflictEditor.axaml b/src/Views/MergeConflictEditor.axaml
index d73038d5cd..e5b4379661 100644
--- a/src/Views/MergeConflictEditor.axaml
+++ b/src/Views/MergeConflictEditor.axaml
@@ -39,7 +39,7 @@
     <Border Grid.Row="1" Padding="8,0" Background="{DynamicResource Brush.ToolBar}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}">
       <Grid ColumnDefinitions="Auto,*,Auto,Auto,Auto">
         <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.File}"/>
-        
+
         <TextBlock Grid.Column="1"
                    Margin="8"
                    Text="{Binding FilePath}"
@@ -55,7 +55,7 @@
                 IsEnabled="{Binding UnsolvedCount, Converter={x:Static c:IntConverters.IsGreaterThanZero}, Mode=OneWay}">
           <Path Width="12" Height="12" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>
         </Button>
-        
+
         <Button Grid.Column="3"
                 Classes="icon_button"
                 Width="32"
diff --git a/src/Views/MoveSubmodule.axaml b/src/Views/MoveSubmodule.axaml
index bab30d1291..4ef27945f9 100644
--- a/src/Views/MoveSubmodule.axaml
+++ b/src/Views/MoveSubmodule.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.MoveSubmodule}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 6e6aee4f1f..86d660cfe8 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -145,7 +145,7 @@
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.ShowChangesPageByDefault}"
                       IsChecked="{Binding ShowLocalChangesByDefault, Mode=TwoWay}"/>
-            
+
             <CheckBox Grid.Row="6" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.General.ShowChangesTabInCommitDetailByDefault}"
@@ -288,7 +288,7 @@
                   <Button Classes="icon_button" Width="28" Height="28" Click="SelectThemeOverrideFile">
                     <Path Width="16" Height="16" Data="{StaticResource Icons.Folder.Open}" Margin="0,2,0,0" Fill="{DynamicResource Brush.FG1}"/>
                   </Button>
-                  
+
                   <Button Classes="icon_button" Width="28" Height="28" Click="OpenThemeRepository">
                     <Path Width="14" Height="14" Data="{StaticResource Icons.Remotes}" Fill="{DynamicResource Brush.FG1}"/>
                   </Button>
diff --git a/src/Views/PruneRemote.axaml b/src/Views/PruneRemote.axaml
index 0484c76dc5..10e99d3cb1 100644
--- a/src/Views/PruneRemote.axaml
+++ b/src/Views/PruneRemote.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.PruneRemote}"/>
     </StackPanel>
-    
+
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
       <TextBlock Text="{DynamicResource Text.PruneRemote.Target}"/>
       <Path Width="14" Height="14" Margin="8,2,8,0" Data="{StaticResource Icons.Remote}"/>
diff --git a/src/Views/PruneWorktrees.axaml b/src/Views/PruneWorktrees.axaml
index b6e45d6116..a7f6f3f44f 100644
--- a/src/Views/PruneWorktrees.axaml
+++ b/src/Views/PruneWorktrees.axaml
@@ -14,7 +14,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.PruneWorktrees}"/>
     </StackPanel>
-    
+
     <TextBlock Text="{DynamicResource Text.PruneWorktrees.Tip}"
                Margin="0,16,0,0"
                HorizontalAlignment="Center"/>
diff --git a/src/Views/Pull.axaml b/src/Views/Pull.axaml
index 328c1318a7..d5a4eb3a71 100644
--- a/src/Views/Pull.axaml
+++ b/src/Views/Pull.axaml
@@ -18,7 +18,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Pull.Title}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,32" ColumnDefinitions="140,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/PushTag.axaml b/src/Views/PushTag.axaml
index 41643ab61c..d188264c36 100644
--- a/src/Views/PushTag.axaml
+++ b/src/Views/PushTag.axaml
@@ -17,7 +17,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.PushTag}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/Rebase.axaml b/src/Views/Rebase.axaml
index f2c0d888f9..141b993258 100644
--- a/src/Views/Rebase.axaml
+++ b/src/Views/Rebase.axaml
@@ -19,7 +19,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Rebase}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,Auto" ColumnDefinitions="130,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/RemoveWorktree.axaml b/src/Views/RemoveWorktree.axaml
index 8ad730b465..6d89ef32de 100644
--- a/src/Views/RemoveWorktree.axaml
+++ b/src/Views/RemoveWorktree.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.RemoveWorktree}"/>
     </StackPanel>
-    
+
     <Grid Margin="8,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right"
diff --git a/src/Views/RenameBranch.axaml b/src/Views/RenameBranch.axaml
index bcc4053468..fd465afa61 100644
--- a/src/Views/RenameBranch.axaml
+++ b/src/Views/RenameBranch.axaml
@@ -17,7 +17,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.RenameBranch}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index f00001ba18..2b6b7f9d51 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -415,7 +415,7 @@
                 <Setter Property="CornerRadius" Value="4"/>
               </Style>
             </ListBox.Styles>
-            <ListBox.ItemTemplate>              
+            <ListBox.ItemTemplate>
               <DataTemplate DataType="vm:Worktree">
                 <Border Height="24"
                         Background="Transparent"
@@ -441,7 +441,7 @@
                         <TextBlock Grid.Row="0" Grid.Column="3"
                                    Margin="6,0,0,0"
                                    Text="{Binding Branch, Mode=OneWay}"/>
-                        
+
                         <TextBlock Grid.Row="1" Grid.Column="0"
                                    Classes="info_label"
                                    HorizontalAlignment="Left" VerticalAlignment="Center"
diff --git a/src/Views/Reset.axaml b/src/Views/Reset.axaml
index 639b6fed44..f521bae60b 100644
--- a/src/Views/Reset.axaml
+++ b/src/Views/Reset.axaml
@@ -18,7 +18,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Reset}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/ResetWithoutCheckout.axaml b/src/Views/ResetWithoutCheckout.axaml
index aea8cf7209..a6cf9d784c 100644
--- a/src/Views/ResetWithoutCheckout.axaml
+++ b/src/Views/ResetWithoutCheckout.axaml
@@ -18,7 +18,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.ResetWithoutCheckout}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/Revert.axaml b/src/Views/Revert.axaml
index c120c0404a..84ef3a98e1 100644
--- a/src/Views/Revert.axaml
+++ b/src/Views/Revert.axaml
@@ -17,7 +17,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Revert}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="130,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/ScanRepositories.axaml b/src/Views/ScanRepositories.axaml
index 1e53e3cff4..58c9c5665e 100644
--- a/src/Views/ScanRepositories.axaml
+++ b/src/Views/ScanRepositories.axaml
@@ -17,7 +17,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.ScanRepositories}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/SetSubmoduleBranch.axaml b/src/Views/SetSubmoduleBranch.axaml
index 718fad7fd6..b04897e96d 100644
--- a/src/Views/SetSubmoduleBranch.axaml
+++ b/src/Views/SetSubmoduleBranch.axaml
@@ -16,7 +16,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.SetSubmoduleBranch}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/SetUpstream.axaml b/src/Views/SetUpstream.axaml
index 367dca668e..f0e3a580c3 100644
--- a/src/Views/SetUpstream.axaml
+++ b/src/Views/SetUpstream.axaml
@@ -18,7 +18,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.SetUpstream}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/StashChanges.axaml b/src/Views/StashChanges.axaml
index 4a171069f0..944f0c1680 100644
--- a/src/Views/StashChanges.axaml
+++ b/src/Views/StashChanges.axaml
@@ -18,7 +18,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.Stash.Title}"/>
     </StackPanel>
-    
+
     <Grid Margin="8,20,0,0" RowDefinitions="32,Auto,Auto,Auto,Auto" ColumnDefinitions="100,356">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right"
diff --git a/src/Views/Statistics.axaml b/src/Views/Statistics.axaml
index ea848d6cca..c0e9b448c1 100644
--- a/src/Views/Statistics.axaml
+++ b/src/Views/Statistics.axaml
@@ -205,7 +205,7 @@
                            Width="12" Height="12"
                            Fill="{DynamicResource Brush.Accent}"
                            Opacity="0.2"/>
-                  
+
                   <TextBlock Grid.Row="0" Grid.Column="1"
                              Margin="12,0,0,0"
                              Text="{Binding All, Mode=OneWay}"/>
diff --git a/src/Views/TextDiffView.axaml b/src/Views/TextDiffView.axaml
index cb3a71ae56..f139727f24 100644
--- a/src/Views/TextDiffView.axaml
+++ b/src/Views/TextDiffView.axaml
@@ -51,7 +51,7 @@
               <ColumnDefinition Width="1" MinWidth="1" MaxWidth="1"/>
               <ColumnDefinition Width="12" MinWidth="12" MaxWidth="12"/>
             </Grid.ColumnDefinitions>
-            
+
             <v:SingleSideTextDiffPresenter Grid.Column="0"
                                            IsOld="True"
                                            FileName="{Binding Option.Path}"
diff --git a/src/Views/UpdateSubmodules.axaml b/src/Views/UpdateSubmodules.axaml
index d902ebb88f..11951301fc 100644
--- a/src/Views/UpdateSubmodules.axaml
+++ b/src/Views/UpdateSubmodules.axaml
@@ -17,7 +17,7 @@
                  Classes="bold"
                  Text="{DynamicResource Text.UpdateSubmodules}"/>
     </StackPanel>
-    
+
     <Grid Margin="0,16,0,0" RowDefinitions="32,Auto,Auto,32,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/ViewLogs.axaml b/src/Views/ViewLogs.axaml
index b6d0d4dfaa..12f6790ef7 100644
--- a/src/Views/ViewLogs.axaml
+++ b/src/Views/ViewLogs.axaml
@@ -81,7 +81,7 @@
                 <ColumnDefinition Width="Auto" SharedSizeGroup="StartTimeColumn"/>
                 <ColumnDefinition Width="Auto" SharedSizeGroup="DurationColumn"/>
               </Grid.ColumnDefinitions>
-              
+
               <v:LoadingIcon Grid.Column="0"
                              Width="14" Height="14"
                              Margin="4,0,4,0"
@@ -92,7 +92,7 @@
                          Text="{Binding Name}"
                          VerticalAlignment="Center"
                          TextTrimming="CharacterEllipsis"/>
-              
+
               <TextBlock Grid.Column="2"
                          Margin="4,0"
                          Foreground="{DynamicResource Brush.FG2}"
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index bd651451cd..18bf85870c 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -50,7 +50,7 @@
                     Margin="0" Padding="0"
                     Click="OnSearchHotKey"
                     HotKey="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
-            
+
             <Button Classes="icon_button" IsVisible="{Binding SearchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" Click="OnClearSearchFilter">
               <Path Width="16" Height="16" Margin="0,0,0,0" Data="{StaticResource Icons.Clear}" Fill="{DynamicResource Brush.FG1}"/>
             </Button>
@@ -220,6 +220,6 @@
                  FontSize="12"
                  Text="{DynamicResource Text.Welcome.DragDropTip}"
                  Opacity=".5"/>
-    </Border>    
+    </Border>
   </Grid>
 </UserControl>
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index bbf509fb42..4275460c4b 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -355,7 +355,7 @@
               </Style>
             </Style>
           </SplitButton.Styles>
-          
+
           <SplitButton.IsEnabled>
             <MultiBinding Converter="{x:Static BoolConverters.And}">
               <Binding Path="IsCommitting" Converter="{x:Static BoolConverters.Not}"/>

From 4033af193e8dab0d2db9aa814eb65756dc4f24db Mon Sep 17 00:00:00 2001
From: Chiahong <36815907+ChiahongHong@users.noreply.github.com>
Date: Mon, 13 Jul 2026 10:00:46 +0800
Subject: [PATCH 38/42] localization: update Traditional Chinese translations
 (#2526)

---
 src/Resources/Locales/zh_TW.axaml | 72 +++++++++++++++----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index fd0b454b2f..fcf0003dd3 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -61,7 +61,7 @@
   <x:String x:Key="Text.Bisect.WaitingForCheckoutAnother">二分搜尋進行中。請簽出另一個提交，然後標記該提交為「良好」或「錯誤」。</x:String>
   <x:String x:Key="Text.Bisect.WaitingForFirstBad">二分搜尋進行中。請標記目前的提交為「錯誤」，或簽出另一個提交並標記為「錯誤」。</x:String>
   <x:String x:Key="Text.Bisect.WaitingForFirstGood">二分搜尋進行中。請標記目前的提交為「良好」或「錯誤」，然後簽出另一個提交。</x:String>
-  <x:String x:Key="Text.Bisect.WaitingForMark">二分搜尋進行中。目前的提交是「良好」是「錯誤」?</x:String>
+  <x:String x:Key="Text.Bisect.WaitingForMark">二分搜尋進行中。目前的提交是「良好」還是「錯誤」?</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">逐行溯源 (blame)</x:String>
   <x:String x:Key="Text.Blame.BlameOnPreviousRevision" xml:space="preserve">對上一個版本執行逐行溯源</x:String>
   <x:String x:Key="Text.Blame.IgnoreWhitespace">忽略空白符號變化</x:String>
@@ -118,7 +118,7 @@
   <x:String x:Key="Text.Checkout" xml:space="preserve">簽出 (checkout) 分支</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">未提交變更:</x:String>
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">目標分支:</x:String>
-  <x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">您目前的分離的 HEAD 包含與任何分支/標籤無關的提交! 您要繼續嗎?</x:String>
+  <x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">目前的 HEAD 包含未連結至任何分支或標籤的提交! 您是否要繼續?</x:String>
   <x:String x:Key="Text.Checkout.WarnUpdatingSubmodules" xml:space="preserve">以下子模組需要更新: {0}，您要立即更新嗎?</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">簽出分支並快轉</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward.Upstream" xml:space="preserve">上游分支: </x:String>
@@ -127,13 +127,13 @@
   <x:String x:Key="Text.CheckoutBranchFromStash.Stash" xml:space="preserve">所選擱置:</x:String>
   <x:String x:Key="Text.CheckoutDetached" xml:space="preserve">簽出提交或標籤</x:String>
   <x:String x:Key="Text.CheckoutDetached.Target" xml:space="preserve">目標:</x:String>
-  <x:String x:Key="Text.CheckoutDetached.Warning" xml:space="preserve">注意：執行該操作後，目前 HEAD 會變為分離 (detached) 狀態!</x:String>
+  <x:String x:Key="Text.CheckoutDetached.Warning" xml:space="preserve">注意: 執行該操作後，目前 HEAD 會變為分離 (detached) 狀態!</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">揀選提交</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">提交資訊中追加來源資訊</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">提交列表:</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">提交變更</x:String>
   <x:String x:Key="Text.CherryPick.Mainline" xml:space="preserve">對比的父提交:</x:String>
-  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">通常您不能對一個合併進行揀選 (cherry-pick)，因為您不知道合併的哪一邊應該被視為主線。這個選項指定了作為主線的父提交，允許揀選相對於該提交的修改。</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">通常您無法揀選 (cherry-pick) 合併提交，因為無法判斷哪個父提交應視為主線。此選項可指定作為主線的父提交。</x:String>
   <x:String x:Key="Text.ClearStashes" xml:space="preserve">捨棄擱置變更確認</x:String>
   <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">您正在捨棄所有的擱置變更，一經操作便無法復原，是否繼續?</x:String>
   <x:String x:Key="Text.Clone" xml:space="preserve">複製 (clone) 遠端存放庫</x:String>
@@ -181,7 +181,7 @@
   <x:String x:Key="Text.CommitDetail.Changes" xml:space="preserve">變更對比</x:String>
   <x:String x:Key="Text.CommitDetail.Changes.Count" xml:space="preserve">個檔案已變更</x:String>
   <x:String x:Key="Text.CommitDetail.Changes.Search" xml:space="preserve">搜尋變更...</x:String>
-  <x:String x:Key="Text.CommitDetail.CollapseToBottom" xml:space="preserve">收起詳細面板</x:String>
+  <x:String x:Key="Text.CommitDetail.CollapseToBottom" xml:space="preserve">收合詳細面板</x:String>
   <x:String x:Key="Text.CommitDetail.Files" xml:space="preserve">檔案列表</x:String>
   <x:String x:Key="Text.CommitDetail.Files.LFS" xml:space="preserve">LFS 檔案</x:String>
   <x:String x:Key="Text.CommitDetail.Files.Search" xml:space="preserve">搜尋檔案...</x:String>
@@ -211,7 +211,7 @@
   <x:String x:Key="Text.Compare.Commits" xml:space="preserve">差異提交</x:String>
   <x:String x:Key="Text.Compare.Commits.LeftOnly" xml:space="preserve">左側獨有提交</x:String>
   <x:String x:Key="Text.Compare.Commits.RightOnly" xml:space="preserve">右側獨有提交</x:String>
-  <x:String x:Key="Text.Compare.Commits.Tips" xml:space="preserve">提示：如果比較的另一方是 HEAD，您可以揀選 (cherry-pick) 已選擇的提交 (使用滑鼠右鍵)</x:String>
+  <x:String x:Key="Text.Compare.Commits.Tips" xml:space="preserve">提示: 如果比較的另一方是 HEAD，您可以揀選 (cherry-pick) 已選擇的提交 (使用滑鼠右鍵)</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">存放庫設定</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">提交訊息範本</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">內建參數:
@@ -230,8 +230,8 @@
 
   ${REPO} 存放庫路徑
   ${REMOTE} 所選的遠端存放庫或所選分支的遠端
-  ${BRANCH} 所選的分支。對於遠端分支，不包含遠端名稱
-  ${BRANCH_FRIENDLY_NAME} 所選的分支。對於遠端分支，不包含遠端名稱
+  ${BRANCH} 所選的分支。遠端分支不包含遠端名稱
+  ${BRANCH_FRIENDLY_NAME} 所選的分支。遠端分支會包含遠端名稱
   ${SHA} 所選的提交編號
   ${TAG} 所選的標籤
   ${FILE} 所選的檔案，相對於存放庫根目錄的路徑
@@ -282,15 +282,15 @@
   <x:String x:Key="Text.Configure.User.Placeholder" xml:space="preserve">用於本存放庫的使用者名稱</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls" xml:space="preserve">編輯自訂動作輸入控制項</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.CheckedValue" xml:space="preserve">啟用時的指令參數:</x:String>
-  <x:String x:Key="Text.ConfigureCustomActionControls.CheckedValue.Tip" xml:space="preserve">勾選 CheckBox 後，此值將用於指令參數中</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.CheckedValue.Tip" xml:space="preserve">勾選核取方塊後，此值將用於指令參數中</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Description" xml:space="preserve">描述:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.DefaultValue" xml:space="preserve">預設值:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.IsFolder" xml:space="preserve">目標路徑是否為資料夾:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Label" xml:space="preserve">名稱:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options" xml:space="preserve">選項列表:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options.Tip" xml:space="preserve">請使用英文「|」符號分隔選項</x:String>
-  <x:String x:Key="Text.ConfigureCustomActionControls.StringFormatter" xml:space="preserve">字串格式化器:</x:String>
-  <x:String x:Key="Text.ConfigureCustomActionControls.StringFormatter.Tip" xml:space="preserve">可選。用於格式化輸出字串。當輸入為空時將被忽略。請使用 `${VALUE}` 來表示輸入字串。</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.StringFormatter" xml:space="preserve">字串格式化:</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.StringFormatter.Tip" xml:space="preserve">選填。用於格式化輸出字串。若輸入為空則會忽略此設定。請使用 `${VALUE}` 來表示輸入字串。</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.StringValue.Tip" xml:space="preserve">內建變數 ${REPO}、${REMOTE}、${BRANCH}、${BRANCH_FRIENDLY_NAME}、${SHA}、${FILE} 及 ${TAG} 在此處仍可使用</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Type" xml:space="preserve">類型:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.UseFriendlyName" xml:space="preserve">輸出包含遠端的名稱:</x:String>
@@ -302,7 +302,7 @@
   <x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">暫存全部變更並提交</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.StageSelectedThenCommit" xml:space="preserve">僅暫存所選變更並提交</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty) 或者自動暫存變更並提交?</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty) 或自動暫存變更並提交?</x:String>
   <x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">系統提示</x:String>
   <x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">您需要重新啟動此應用程式才能套用變更!</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">產生約定式提交訊息</x:String>
@@ -442,12 +442,12 @@
   <x:String x:Key="Text.FileHistory" xml:space="preserve">檔案歷史</x:String>
   <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">檔案變更</x:String>
   <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">檔案內容</x:String>
-  <x:String x:Key="Text.FileModeChange" xml:space="preserve">檔案類型變更：</x:String>
-  <x:String x:Key="Text.FileModeChange.Deleted" xml:space="preserve">刪除檔案類型：</x:String>
+  <x:String x:Key="Text.FileModeChange" xml:space="preserve">檔案類型變更:</x:String>
+  <x:String x:Key="Text.FileModeChange.Deleted" xml:space="preserve">刪除檔案類型:</x:String>
   <x:String x:Key="Text.FileModeChange.Directory" xml:space="preserve">目錄</x:String>
   <x:String x:Key="Text.FileModeChange.Executable" xml:space="preserve">可執行檔案</x:String>
-  <x:String x:Key="Text.FileModeChange.New" xml:space="preserve">新增檔案類型：</x:String>
-  <x:String x:Key="Text.FileModeChange.Normal" xml:space="preserve">普通檔案</x:String>
+  <x:String x:Key="Text.FileModeChange.New" xml:space="preserve">新增檔案類型:</x:String>
+  <x:String x:Key="Text.FileModeChange.Normal" xml:space="preserve">一般檔案</x:String>
   <x:String x:Key="Text.FileModeChange.Submodule" xml:space="preserve">子模組</x:String>
   <x:String x:Key="Text.FileModeChange.Symlink" xml:space="preserve">符號連結</x:String>
   <x:String x:Key="Text.FileModeChange.Unknown" xml:space="preserve">未知</x:String>
@@ -554,7 +554,7 @@
   <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">拉取 (pull) 遠端的變更</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">推送 (push) 本機變更到遠端存放庫</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">強制重新載入存放庫</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.ToggleHistoriesDetailPanel" xml:space="preserve">在歷史頁面中展開/收起詳細面板</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.ToggleHistoriesDetailPanel" xml:space="preserve">在歷史頁面中展開/收合詳細面板</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">顯示本機變更</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">顯示歷史記錄</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewStashes" xml:space="preserve">顯示擱置變更列表</x:String>
@@ -575,7 +575,7 @@
   <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">正在復原提交</x:String>
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">互動式重定基底</x:String>
   <x:String x:Key="Text.InteractiveRebase.AutoStash" xml:space="preserve">自動擱置變更並復原本機變更</x:String>
-  <x:String x:Key="Text.InteractiveRebase.NoVerify" xml:space="preserve">繞過 pre-rebase 鉤子</x:String>
+  <x:String x:Key="Text.InteractiveRebase.NoVerify" xml:space="preserve">繞過 pre-rebase hook</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">起始提交:</x:String>
   <x:String x:Key="Text.InteractiveRebase.ReorderTip" xml:space="preserve">拖曳以重新排序提交</x:String>
   <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">目標分支:</x:String>
@@ -592,10 +592,10 @@
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">目標分支:</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">合併方式:</x:String>
   <x:String x:Key="Text.Merge.Source" xml:space="preserve">合併來源:</x:String>
-  <x:String x:Key="Text.Merge.Test" xml:space="preserve">偵測合併衝突中...</x:String>
+  <x:String x:Key="Text.Merge.Test" xml:space="preserve">正在偵測合併衝突...</x:String>
   <x:String x:Key="Text.Merge.Test.NoConflicts" xml:space="preserve">合併操作不會產生衝突</x:String>
   <x:String x:Key="Text.Merge.Test.UnknownError" xml:space="preserve">偵測合併衝突時發生未知錯誤</x:String>
-  <x:String x:Key="Text.Merge.Test.WillCauseConflicts" xml:space="preserve">合併操作將存在衝突檔案</x:String>
+  <x:String x:Key="Text.Merge.Test.WillCauseConflicts" xml:space="preserve">合併操作將產生檔案衝突</x:String>
   <x:String x:Key="Text.MergeConflictEditor.AcceptBoth.MineFirst" xml:space="preserve">先套用我方版本 (ours)，再套用對方版本 (theirs)</x:String>
   <x:String x:Key="Text.MergeConflictEditor.AcceptBoth.TheirsFirst" xml:space="preserve">先套用對方版本 (theirs)，再套用我方版本 (ours)</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UseBoth" xml:space="preserve">套用兩者</x:String>
@@ -659,7 +659,7 @@
   <x:String x:Key="Text.Preferences.AI.AdditionalPrompt" xml:space="preserve">附加提示詞 (請使用 '-' 列出您的要求)</x:String>
   <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">API 金鑰</x:String>
   <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">模型</x:String>
-  <x:String x:Key="Text.Preferences.AI.Model.AutoFetchAvailableModels" xml:space="preserve">自動獲取可用的模型列表</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model.AutoFetchAvailableModels" xml:space="preserve">自動取得可用的模型列表</x:String>
   <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">名稱</x:String>
   <x:String x:Key="Text.Preferences.AI.ReadApiKeyFromEnv" xml:space="preserve">從環境變數中 (輸入環境變數名稱) 讀取 API 金鑰</x:String>
   <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">伺服器</x:String>
@@ -711,7 +711,7 @@
   <x:String x:Key="Text.Preferences.Git.UseLibsecret" xml:space="preserve">使用 git-credential-libsecret 取代 git-credential-manager</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">使用者名稱</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">預設 Git 使用者名稱</x:String>
-  <x:String x:Key="Text.Preferences.Git.UseStashAndReapplyByDefault" xml:space="preserve">在檢出或合併分支時，預設擱置變更並自動復原</x:String>
+  <x:String x:Key="Text.Preferences.Git.UseStashAndReapplyByDefault" xml:space="preserve">在簽出或合併分支時，預設擱置變更並自動復原</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git 版本</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG 簽章</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">啟用提交簽章</x:String>
@@ -724,7 +724,7 @@
   <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">第三方工具整合</x:String>
   <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">終端機/Shell</x:String>
   <x:String x:Key="Text.Preferences.Shell.Args" xml:space="preserve">啟動參數</x:String>
-  <x:String x:Key="Text.Preferences.Shell.Args.Tip" xml:space="preserve">請使用「.」標示當前工作目錄</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Args.Tip" xml:space="preserve">請使用「.」表示目前工作目錄</x:String>
   <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">安裝路徑</x:String>
   <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">終端機/Shell</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">清理遠端已刪除分支</x:String>
@@ -761,10 +761,10 @@
   <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">自動擱置變更並復原本機變更</x:String>
   <x:String x:Key="Text.Rebase.NoVerify" xml:space="preserve">繞過 pre-rebase 鉤子</x:String>
   <x:String x:Key="Text.Rebase.On" xml:space="preserve">目標提交:</x:String>
-  <x:String x:Key="Text.Rebase.Test" xml:space="preserve">偵測重定基底衝突中...</x:String>
+  <x:String x:Key="Text.Rebase.Test" xml:space="preserve">正在偵測重定基底衝突...</x:String>
   <x:String x:Key="Text.Rebase.Test.OK" xml:space="preserve">重定基底操作不會產生衝突</x:String>
   <x:String x:Key="Text.Rebase.Test.UnknownError" xml:space="preserve">偵測重定基底衝突時發生未知錯誤</x:String>
-  <x:String x:Key="Text.Rebase.Test.WillCauseConflicts" xml:space="preserve">重定基底操作將存在衝突檔案</x:String>
+  <x:String x:Key="Text.Rebase.Test.WillCauseConflicts" xml:space="preserve">重定基底操作將產生檔案衝突</x:String>
   <x:String x:Key="Text.Remote.AddTitle" xml:space="preserve">新增遠端存放庫</x:String>
   <x:String x:Key="Text.Remote.EditTitle" xml:space="preserve">編輯遠端存放庫</x:String>
   <x:String x:Key="Text.Remote.Name" xml:space="preserve">遠端名稱:</x:String>
@@ -777,7 +777,7 @@
   <x:String x:Key="Text.RemoteCM.Edit" xml:space="preserve">編輯...</x:String>
   <x:String x:Key="Text.RemoteCM.EnableAutoFetch" xml:space="preserve">啟用定時自動提取</x:String>
   <x:String x:Key="Text.RemoteCM.Fetch" xml:space="preserve">提取 (fetch) 更新</x:String>
-  <x:String x:Key="Text.RemoteCM.OpenInBrowser" xml:space="preserve">在瀏覽器中存取網址</x:String>
+  <x:String x:Key="Text.RemoteCM.OpenInBrowser" xml:space="preserve">在瀏覽器中開啟網址</x:String>
   <x:String x:Key="Text.RemoteCM.Prune" xml:space="preserve">清理遠端已刪除分支</x:String>
   <x:String x:Key="Text.RemoveWorktree" xml:space="preserve">刪除工作區操作確認</x:String>
   <x:String x:Key="Text.RemoveWorktree.Force" xml:space="preserve">啟用 [--force] 選項</x:String>
@@ -787,10 +787,10 @@
   <x:String x:Key="Text.RenameBranch.Name.Placeholder" xml:space="preserve">新的分支名稱不能與現有分支名稱相同</x:String>
   <x:String x:Key="Text.RenameBranch.Target" xml:space="preserve">分支:</x:String>
   <x:String x:Key="Text.Repository.Abort" xml:space="preserve">中止</x:String>
-  <x:String x:Key="Text.Repository.AutoFetching" xml:space="preserve">自動提取遠端變更中...</x:String>
+  <x:String x:Key="Text.Repository.AutoFetching" xml:space="preserve">正在自動提取遠端變更...</x:String>
   <x:String x:Key="Text.Repository.BranchSort" xml:space="preserve">排序</x:String>
   <x:String x:Key="Text.Repository.BranchSort.ByCommitterDate" xml:space="preserve">依建立時間</x:String>
-  <x:String x:Key="Text.Repository.BranchSort.ByName" xml:space="preserve">依名稱升序</x:String>
+  <x:String x:Key="Text.Repository.BranchSort.ByName" xml:space="preserve">依名稱遞增排序</x:String>
   <x:String x:Key="Text.Repository.Clean" xml:space="preserve">清理本存放庫 (GC)</x:String>
   <x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">本操作將執行 `git gc` 指令。</x:String>
   <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">清空篩選規則</x:String>
@@ -835,8 +835,8 @@
   <x:String x:Key="Text.Repository.ShowFirstParentOnly" xml:space="preserve">只顯示合併提交的第一父提交</x:String>
   <x:String x:Key="Text.Repository.ShowFlags" xml:space="preserve">顯示內容</x:String>
   <x:String x:Key="Text.Repository.ShowLostCommits" xml:space="preserve">顯示失去參照的提交</x:String>
-  <x:String x:Key="Text.Repository.ShowSubmodulesAsTree" xml:space="preserve">以樹型結構展示</x:String>
-  <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">以樹型結構展示</x:String>
+  <x:String x:Key="Text.Repository.ShowSubmodulesAsTree" xml:space="preserve">以樹狀結構顯示</x:String>
+  <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">以樹狀結構顯示</x:String>
   <x:String x:Key="Text.Repository.Skip" xml:space="preserve">跳過此提交</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">提交統計</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">子模組列表</x:String>
@@ -865,7 +865,7 @@
   <x:String x:Key="Text.Revert" xml:space="preserve">復原操作確認</x:String>
   <x:String x:Key="Text.Revert.Commit" xml:space="preserve">目標提交:</x:String>
   <x:String x:Key="Text.Revert.CommitChanges" xml:space="preserve">復原後提交變更</x:String>
-  <x:String x:Key="Text.Running" xml:space="preserve">執行操作中，請耐心等待...</x:String>
+  <x:String x:Key="Text.Running" xml:space="preserve">正在執行操作，請耐心等待...</x:String>
   <x:String x:Key="Text.Save" xml:space="preserve">儲存</x:String>
   <x:String x:Key="Text.SaveAs" xml:space="preserve">另存新檔...</x:String>
   <x:String x:Key="Text.SaveAsPatchSuccess" xml:space="preserve">修補檔已成功儲存!</x:String>
@@ -933,8 +933,8 @@
   <x:String x:Key="Text.Submodule.RelativePath" xml:space="preserve">相對存放庫路徑:</x:String>
   <x:String x:Key="Text.Submodule.RelativePath.Placeholder" xml:space="preserve">本機存放的相對路徑。</x:String>
   <x:String x:Key="Text.Submodule.Remove" xml:space="preserve">刪除</x:String>
-  <x:String x:Key="Text.Submodule.SetBranch" xml:space="preserve">更改追蹤分支</x:String>
-  <x:String x:Key="Text.Submodule.SetURL" xml:space="preserve">更改遠端網址</x:String>
+  <x:String x:Key="Text.Submodule.SetBranch" xml:space="preserve">變更追蹤分支</x:String>
+  <x:String x:Key="Text.Submodule.SetURL" xml:space="preserve">變更遠端網址</x:String>
   <x:String x:Key="Text.Submodule.Status" xml:space="preserve">狀態</x:String>
   <x:String x:Key="Text.Submodule.Status.Modified" xml:space="preserve">未提交變更</x:String>
   <x:String x:Key="Text.Submodule.Status.NotInited" xml:space="preserve">未初始化</x:String>
@@ -964,7 +964,7 @@
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">更新所有子模組</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">如果子模組尚未初始化，則將其初始化</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">子模組:</x:String>
-  <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">遞迴更新多層級子模組</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">遞迴更新子模組</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UpdateToRemoteTrackingBranch" xml:space="preserve">更新至子模組的遠端追蹤分支</x:String>
   <x:String x:Key="Text.URL" xml:space="preserve">存放庫網址:</x:String>
   <x:String x:Key="Text.ViewLogs" xml:space="preserve">記錄</x:String>
@@ -980,7 +980,7 @@
   <x:String x:Key="Text.Welcome.DragDropTip" xml:space="preserve">支援拖放以新增目錄與自訂群組。</x:String>
   <x:String x:Key="Text.Welcome.Edit" xml:space="preserve">編輯</x:String>
   <x:String x:Key="Text.Welcome.Move" xml:space="preserve">調整存放庫分組</x:String>
-  <x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">開啟所有包含存放庫</x:String>
+  <x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">開啟所有存放庫</x:String>
   <x:String x:Key="Text.Welcome.OpenOrInit" xml:space="preserve">開啟本機存放庫</x:String>
   <x:String x:Key="Text.Welcome.OpenTerminal" xml:space="preserve">開啟終端機</x:String>
   <x:String x:Key="Text.Welcome.ScanDefaultCloneDir" xml:space="preserve">重新掃描預設複製 (clone) 目錄下的存放庫</x:String>
@@ -1002,7 +1002,7 @@
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">觸發點擊事件</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">提交 (修改原始提交)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">自動暫存全部變更並提交</x:String>
-  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithDetachedHead">您正在向一個分離狀態的 HEAD 提交變更，您確定要繼續提交嗎?</x:String>
+  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithDetachedHead">HEAD 目前處於分離狀態。您確定要繼續提交變更嗎?</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithFilter" xml:space="preserve">您已暫存 {0} 個檔案，但只顯示 {1} 個檔案 ({2} 個檔案被篩選器隱藏)。您確定要繼續提交嗎?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">偵測到衝突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Merge" xml:space="preserve">解決衝突</x:String>

From 8f75493dc1ccac5e7272e67c9d327d7b421fd1d5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Jul 2026 10:02:40 +0800
Subject: [PATCH 39/42] version: Release 2026.15

Signed-off-by: leo <longshuang@msn.cn>
---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 00b2313d90..3f492ad1c9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2026.14
\ No newline at end of file
+2026.15
\ No newline at end of file

From ed8268ed0055d5bb78bc1ed20728c9860937e433 Mon Sep 17 00:00:00 2001
From: Shawn Koonin <sdkorders@gmail.com>
Date: Sun, 12 Jul 2026 20:15:12 -0700
Subject: [PATCH 40/42] version: start 2026.17-sk-dev

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 0344429986..507f240d1b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2026.16-sk
\ No newline at end of file
+2026.17-sk-dev
\ No newline at end of file

From ca3613616b1b1305c1413f12e7bd1ffb27786a5e Mon Sep 17 00:00:00 2001
From: Shawn Koonin <sdkorders@gmail.com>
Date: Fri, 24 Jul 2026 13:28:33 -0700
Subject: [PATCH 41/42] build: opt out of Avalonia build telemetry

AvaloniaStatsTask writes to ~/Library/Application Support/AvaloniaUI, which fails in restricted/sandboxed build environments. Opt out to keep builds hermetic.
---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 3abcaaf7f4..cc1b846d9a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,10 @@
 # GitHub Actions are disabled in this repository; `make check` is the local CI gate.
 
 DOTNET ?= $(shell command -v dotnet 2>/dev/null || echo $(HOME)/.local/share/dotnet/dotnet)
+# Avalonia's build-time stats task writes to ~/Library/Application Support/AvaloniaUI;
+# that write fails in restricted/sandboxed environments and breaks the build. Opt out to
+# keep builds hermetic. Only affects build telemetry, not the app.
+export AVALONIA_TELEMETRY_OPTOUT := true
 # Lazy so only the app target shells out for the version.
 VERSION = $(shell cat VERSION)
 RUNTIME ?= osx-arm64

From 7f0462c31a1e8695896b8e1105fc80d544cc133b Mon Sep 17 00:00:00 2001
From: Shawn Koonin <sdkorders@gmail.com>
Date: Fri, 24 Jul 2026 13:38:44 -0700
Subject: [PATCH 42/42] docs: note upstream v2026.15 sync and fork
 customizations

Add a Fork customizations section to the README (marked fork-only) and an Unreleased CHANGELOG entry for the upstream sync.
---
 CHANGELOG.md |  6 ++++++
 README.md    | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e01feae04..1bba5b7f88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 Fork releases of SourceGit-SK. Upstream changes arrive through upstream release merges and are documented in the [upstream release notes](https://github.com/sourcegit-scm/sourcegit/releases).
 
+## [Unreleased]
+
+### Changed
+
+- Merged upstream [v2026.15](https://github.com/sourcegit-scm/sourcegit/releases/tag/v2026.15) into the fork, bringing upstream's fixes and improvements while keeping all fork customizations ([#9](https://github.com/skoonin/sourcegit-sk/pull/9))
+
 ## [2026.16-sk] - 2026-07-12
 
 ### Added
diff --git a/README.md b/README.md
index 2bf6c6968b..bf68518fa3 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,16 @@
 [![latest](https://img.shields.io/github/v/release/sourcegit-scm/sourcegit.svg)](https://github.com/sourcegit-scm/sourcegit/releases/latest)
 [![downloads](https://img.shields.io/github/downloads/sourcegit-scm/sourcegit/total)](https://github.com/sourcegit-scm/sourcegit/releases)
 
+## Fork customizations (SourceGit-SK)
+
+This is a personal fork of [sourcegit-scm/sourcegit](https://github.com/sourcegit-scm/sourcegit) that tracks upstream and adds the changes below. These are specific to this fork and are not part of upstream SourceGit. See [CHANGELOG.md](CHANGELOG.md) for the full history.
+
+* **Stacked multi-file diff** across every change view (working copy, commit details, compare, revision compare, submodule compare, stashes): with no file selected the whole change set shows as one scrollable diff; selecting several files stacks those; selecting one shows a single file. Includes a shared toolbar, file navigation, and per-file context controls.
+* **Recent-commits block in the repository sidebar**, showing the full commit graph.
+* **Bracket tab switching**: Cmd+Shift+[ / Cmd+Shift+] on macOS (Ctrl+Shift on Windows/Linux) moves between tabs; the existing bindings still work.
+* **"Open Another Repository..."** entry in the repository switcher (Ctrl/Cmd+P) opens a folder picker for a repo not yet in the list.
+* **Fork versioning**: releases carry an `-sk` suffix (shown in the About dialog), and the update check points at this fork's releases instead of upstream's.
+
 ## Screenshots
 
 * Dark Theme