From ee70be41a8952825d109f2f108adfe9440d6ba9d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 15 Dec 2025 11:42:08 +0800
Subject: [PATCH 01/51] project: Update third-party dependencies

- Upgrade `OpenAI` to `2.8.0`
- Upgrade `Azure.AI.OpenAI` to `2.8.0-beta.1`
- Upgrade `Pfim`  to `0.11.4`

Signed-off-by: leo <longshuang@msn.cn>
---
 THIRD-PARTY-LICENSES.md | 6 +++---
 src/SourceGit.csproj    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
index 49de958a6..5c696b1ba 100644
--- a/THIRD-PARTY-LICENSES.md
+++ b/THIRD-PARTY-LICENSES.md
@@ -35,14 +35,14 @@ The project uses the following third-party libraries or assets
 ### OpenAI .NET SDK
 
 - **Source**: https://github.com/openai/openai-dotnet
-- **Version**: 2.5.0
+- **Version**: 2.8.0
 - **License**: MIT License
 - **License Link**: https://github.com/openai/openai-dotnet/blob/main/LICENSE
 
 ### Azure.AI.OpenAI
 
 - **Source**: https://github.com/Azure/azure-sdk-for-net
-- **Version**: 2.5.0-beta.1
+- **Version**: 2.8.0-beta.1
 - **License**: MIT License
 - **License Link**: https://github.com/Azure/azure-sdk-for-net/blob/main/LICENSE.txt
 
@@ -56,7 +56,7 @@ The project uses the following third-party libraries or assets
 ### Pfim
 
 - **Source**: https://github.com/nickbabcock/Pfim
-- **Version**: 0.11.3
+- **Version**: 0.11.4
 - **License**: MIT License
 - **License Link**: https://github.com/nickbabcock/Pfim/blob/master/LICENSE.txt
 
diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 9cc5c3f76..34f2c0163 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -51,12 +51,12 @@
     <PackageReference Include="Avalonia.Diagnostics" Version="11.3.9" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.3.0" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.5.0-beta.1" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.8.0-beta.1" />
     <PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.660" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc6.1" />
-    <PackageReference Include="OpenAI" Version="2.5.0" />
-    <PackageReference Include="Pfim" Version="0.11.3" />
+    <PackageReference Include="OpenAI" Version="2.8.0" />
+    <PackageReference Include="Pfim" Version="0.11.4" />
     <PackageReference Include="TextMateSharp" Version="1.0.70" />
     <PackageReference Include="TextMateSharp.Grammars" Version="1.0.70" />
   </ItemGroup>

From 5ef607244a676adbf5fcdaa8e305b180e0888a36 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 15 Dec 2025 11:54:17 +0800
Subject: [PATCH 02/51] feature: supports `R16F` and `R32F` dds image

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

diff --git a/src/ViewModels/ImageSource.cs b/src/ViewModels/ImageSource.cs
index 5f0c88dd9..2f9bdf420 100644
--- a/src/ViewModels/ImageSource.cs
+++ b/src/ViewModels/ImageSource.cs
@@ -108,6 +108,12 @@ private static ImageSource DecodeWithPfim(Stream stream, long size)
                     case ImageFormat.Rgb8:
                         pixelFormat = PixelFormats.Gray8;
                         break;
+                    case ImageFormat.R16f:
+                        pixelFormat = PixelFormats.Gray16;
+                        break;
+                    case ImageFormat.R32f:
+                        pixelFormat = PixelFormats.Gray32Float;
+                        break;
                     case ImageFormat.R5g5b5:
                         pixelFormat = PixelFormats.Bgr555;
                         break;

From 76e3df6d8dd39cf98e77b2fa5b27e1102b8644dc Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 15 Dec 2025 12:33:00 +0800
Subject: [PATCH 03/51] fix: wrong diff arguments for xcode `FileMerge` (#1979)

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

diff --git a/src/Models/ExternalMerger.cs b/src/Models/ExternalMerger.cs
index ce90a7d44..655a1d58a 100644
--- a/src/Models/ExternalMerger.cs
+++ b/src/Models/ExternalMerger.cs
@@ -50,7 +50,7 @@ static ExternalMerger()
             {
                 Supported = new List<ExternalMerger>() {
                     new ExternalMerger("git", "Use Git Settings", "", "", ""),
-                    new ExternalMerger("xcode", "FileMerge", "/usr/bin/opendiff", "\"$BASE\" \"$LOCAL\" \"$REMOTE\" -ancestor \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMerger("xcode", "FileMerge", "/usr/bin/opendiff", "\"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger("vscode", "Visual Studio Code", "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger("vscode_insiders", "Visual Studio Code - Insiders", "/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger("kdiff3", "KDiff3", "/Applications/kdiff3.app/Contents/MacOS/kdiff3", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),

From 99c7e384b5083128cc5f521bc7b6ca91bb5d2161 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 15 Dec 2025 14:39:45 +0800
Subject: [PATCH 04/51] refactor: rework `Merge` popup (#1973)

- Hide `Customize merge message` option when selected `Squash` or `Don't commit` mode.
- Read `$GIT_DIR/SQUASH_MSG` after merging with `Squash` mode
- Clear commit message after discarding all changes
- Cleanup code

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/AIAssistant.cs           |  9 +++-----
 src/ViewModels/Discard.cs               |  5 +++++
 src/ViewModels/Merge.cs                 | 30 +++++++++++++++++++++----
 src/ViewModels/Repository.cs            |  6 +++++
 src/Views/CommitMessageToolBox.axaml.cs |  4 ++--
 src/Views/Merge.axaml                   |  3 ++-
 src/Views/WorkingCopy.axaml.cs          |  4 ++--
 7 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/ViewModels/AIAssistant.cs b/src/ViewModels/AIAssistant.cs
index 920fafcf5..d538ce1b5 100644
--- a/src/ViewModels/AIAssistant.cs
+++ b/src/ViewModels/AIAssistant.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -23,12 +22,11 @@ public string Text
             private set => SetProperty(ref _text, value);
         }
 
-        public AIAssistant(Repository repo, Models.OpenAIService service, List<Models.Change> changes, Action<string> onApply)
+        public AIAssistant(Repository repo, Models.OpenAIService service, List<Models.Change> changes)
         {
             _repo = repo;
             _service = service;
             _changes = changes;
-            _onApply = onApply;
             _cancel = new CancellationTokenSource();
 
             Gen();
@@ -44,7 +42,7 @@ public void Regen()
 
         public void Apply()
         {
-            _onApply?.Invoke(Text);
+            _repo.SetCommitMessage(Text);
         }
 
         public void Cancel()
@@ -72,7 +70,6 @@ private void Gen()
         private readonly Repository _repo = null;
         private Models.OpenAIService _service = null;
         private List<Models.Change> _changes = null;
-        private Action<string> _onApply = null;
         private CancellationTokenSource _cancel = null;
         private bool _isGenerating = false;
         private string _text = string.Empty;
diff --git a/src/ViewModels/Discard.cs b/src/ViewModels/Discard.cs
index 99c225b9d..78c7b4bd6 100644
--- a/src/ViewModels/Discard.cs
+++ b/src/ViewModels/Discard.cs
@@ -71,9 +71,14 @@ public override async Task<bool> Sure()
             Use(log);
 
             if (Mode is DiscardAllMode all)
+            {
                 await Commands.Discard.AllAsync(_repo.FullPath, all.IncludeUntracked, all.IncludeIgnored, log);
+                _repo.ClearCommitMessage();
+            }
             else
+            {
                 await Commands.Discard.ChangesAsync(_repo.FullPath, _changes, log);
+            }
 
             log.Complete();
             _repo.MarkWorkingCopyDirtyManually();
diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
index 612eb6311..28bc9d8d7 100644
--- a/src/ViewModels/Merge.cs
+++ b/src/ViewModels/Merge.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
 {
@@ -16,8 +17,20 @@ public string Into
 
         public Models.MergeMode Mode
         {
-            get;
-            set;
+            get => _mode;
+            set
+            {
+                if (SetProperty(ref _mode, value))
+                    CanEditMessage = _mode == Models.MergeMode.Default ||
+                        _mode == Models.MergeMode.FastForward ||
+                        _mode == Models.MergeMode.NoFastForward;
+            }
+        }
+
+        public bool CanEditMessage
+        {
+            get => _canEditMessage;
+            set => SetProperty(ref _canEditMessage, value);
         }
 
         public bool Edit
@@ -65,12 +78,19 @@ public override async Task<bool> Sure()
             var log = _repo.CreateLog($"Merging '{_sourceName}' into '{Into}'");
             Use(log);
 
-            var succ = await new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, Edit)
+            var succ = await new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, _canEditMessage && Edit)
                 .Use(log)
                 .ExecAsync();
 
             if (succ)
             {
+                var squashMsgFile = Path.Combine(_repo.GitDir, "SQUASH_MSG");
+                if (Mode == Models.MergeMode.Squash && File.Exists(squashMsgFile))
+                {
+                    var msg = await File.ReadAllTextAsync(squashMsgFile);
+                    _repo.SetCommitMessage(msg);
+                }
+
                 var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath).GetResultAsync();
                 if (submodules.Count > 0)
                     await new Commands.Submodule(_repo.FullPath)
@@ -113,5 +133,7 @@ private Models.MergeMode AutoSelectMergeMode()
 
         private readonly Repository _repo = null;
         private readonly string _sourceName;
+        private Models.MergeMode _mode = Models.MergeMode.Default;
+        private bool _canEditMessage = true;
     }
 }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 3f8c26ee8..e90ad246c 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -888,6 +888,12 @@ public void NavigateToCommit(string sha, bool isDelayMode = false)
             }
         }
 
+        public void SetCommitMessage(string message)
+        {
+            if (_workingCopy is not null)
+                _workingCopy.CommitMessage = message;
+        }
+
         public void ClearCommitMessage()
         {
             if (_workingCopy is not null)
diff --git a/src/Views/CommitMessageToolBox.axaml.cs b/src/Views/CommitMessageToolBox.axaml.cs
index 8bc41b991..01451e942 100644
--- a/src/Views/CommitMessageToolBox.axaml.cs
+++ b/src/Views/CommitMessageToolBox.axaml.cs
@@ -505,7 +505,7 @@ private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
 
                 if (services.Count == 1)
                 {
-                    await App.ShowDialog(new ViewModels.AIAssistant(repo, services[0], vm.Staged, t => vm.CommitMessage = t));
+                    await App.ShowDialog(new ViewModels.AIAssistant(repo, services[0], vm.Staged));
                     return;
                 }
 
@@ -517,7 +517,7 @@ private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
                     item.Header = service.Name;
                     item.Click += async (_, ev) =>
                     {
-                        await App.ShowDialog(new ViewModels.AIAssistant(repo, dup, vm.Staged, t => vm.CommitMessage = t));
+                        await App.ShowDialog(new ViewModels.AIAssistant(repo, dup, vm.Staged));
                         ev.Handled = true;
                     };
 
diff --git a/src/Views/Merge.axaml b/src/Views/Merge.axaml
index dffcc6fd9..5ceb93ff7 100644
--- a/src/Views/Merge.axaml
+++ b/src/Views/Merge.axaml
@@ -19,7 +19,7 @@
                  Text="{DynamicResource Text.Merge}"/>
     </StackPanel>
     
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32" ColumnDefinitions="130,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto" ColumnDefinitions="130,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -99,6 +99,7 @@
                 Height="32"
                 Content="{DynamicResource Text.Merge.Edit}"
                 IsChecked="{Binding Edit, Mode=TwoWay}"
+                IsVisible="{Binding CanEditMessage, Mode=OneWay}"
                 ToolTip.Tip="--edit"/>
     </Grid>
   </StackPanel>
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
index b786b0d9e..5840d247a 100644
--- a/src/Views/WorkingCopy.axaml.cs
+++ b/src/Views/WorkingCopy.axaml.cs
@@ -890,7 +890,7 @@ public ContextMenu CreateContextMenuForStagedChanges(ViewModels.WorkingCopy vm,
                 {
                     ai.Click += async (_, e) =>
                     {
-                        await App.ShowDialog(new ViewModels.AIAssistant(repo, services[0], selectedStaged, t => vm.CommitMessage = t));
+                        await App.ShowDialog(new ViewModels.AIAssistant(repo, services[0], selectedStaged));
                         e.Handled = true;
                     };
                 }
@@ -904,7 +904,7 @@ public ContextMenu CreateContextMenuForStagedChanges(ViewModels.WorkingCopy vm,
                         item.Header = service.Name;
                         item.Click += async (_, e) =>
                         {
-                            await App.ShowDialog(new ViewModels.AIAssistant(repo, dup, selectedStaged, t => vm.CommitMessage = t));
+                            await App.ShowDialog(new ViewModels.AIAssistant(repo, dup, selectedStaged));
                             e.Handled = true;
                         };
 

From 2e20b0e328e3ec38672d6b1ffade280defe802b0 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 16 Dec 2025 17:28:22 +0800
Subject: [PATCH 05/51] enhance: when a private key is given, do not read
 default ssh configuration

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

diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
index 520f19703..e6e64f054 100644
--- a/src/Commands/Command.cs
+++ b/src/Commands/Command.cs
@@ -181,7 +181,7 @@ protected ProcessStartInfo CreateGitStartInfo(bool redirect)
 
             // If an SSH private key was provided, sets the environment.
             if (!start.Environment.ContainsKey("GIT_SSH_COMMAND") && !string.IsNullOrEmpty(SSHKey))
-                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}'");
+                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}' -F '/dev/null'");
 
             // Force using en_US.UTF-8 locale
             if (OperatingSystem.IsLinux())

From 9f9b8f30c389bdae6e71d904db4d300856051fc4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 17 Dec 2025 10:38:11 +0800
Subject: [PATCH 06/51] enhance: auto select tracking branch after `Tracking
 remote branch` option is toggled while creating worktree (#1983)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/AddWorktree.cs | 31 ++++++++++++++++++++++++-------
 src/Views/AddWorktree.axaml   |  7 +++++--
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/ViewModels/AddWorktree.cs b/src/ViewModels/AddWorktree.cs
index 7679b4509..a1985d51f 100644
--- a/src/ViewModels/AddWorktree.cs
+++ b/src/ViewModels/AddWorktree.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Threading.Tasks;
@@ -51,7 +52,11 @@ public string SelectedBranch
         public bool SetTrackingBranch
         {
             get => _setTrackingBranch;
-            set => SetProperty(ref _setTrackingBranch, value);
+            set
+            {
+                if (SetProperty(ref _setTrackingBranch, value))
+                    AutoSelectTrackingBranch();
+            }
         }
 
         public string SelectedTrackingBranch
@@ -73,11 +78,6 @@ public AddWorktree(Repository repo)
                 else
                     RemoteBranches.Add(branch.FriendlyName);
             }
-
-            if (RemoteBranches.Count > 0)
-                SelectedTrackingBranch = RemoteBranches[0];
-            else
-                SelectedTrackingBranch = string.Empty;
         }
 
         public static ValidationResult ValidateWorktreePath(string path, ValidationContext ctx)
@@ -123,6 +123,23 @@ public override async Task<bool> Sure()
             return succ;
         }
 
+        private void AutoSelectTrackingBranch()
+        {
+            if (!_setTrackingBranch || RemoteBranches.Count == 0)
+                return;
+
+            var name = string.IsNullOrEmpty(_selectedBranch) ? System.IO.Path.GetFileName(_path.TrimEnd('/', '\\')) : _selectedBranch;
+            var remoteBranch = RemoteBranches.Find(b => b.Substring(b.IndexOf('/') + 1).Equals(name, StringComparison.Ordinal));
+            if (string.IsNullOrEmpty(remoteBranch))
+                remoteBranch = RemoteBranches[0];
+
+            if (!remoteBranch.Equals(SelectedTrackingBranch, StringComparison.Ordinal))
+            {
+                SelectedTrackingBranch = remoteBranch;
+                OnPropertyChanged(nameof(SelectedTrackingBranch));
+            }
+        }
+
         private Repository _repo = null;
         private string _path = string.Empty;
         private bool _createNewBranch = true;
diff --git a/src/Views/AddWorktree.axaml b/src/Views/AddWorktree.axaml
index 5ca70d9b2..6fcc546ec 100644
--- a/src/Views/AddWorktree.axaml
+++ b/src/Views/AddWorktree.axaml
@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.AddWorktree"
              x:DataType="vm:AddWorktree">
@@ -17,7 +18,7 @@
                  Text="{DynamicResource Text.AddWorktree}"/>
     </StackPanel>
     
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,32" ColumnDefinitions="150,*">
+    <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"
                  Margin="0,0,8,0"
@@ -101,8 +102,10 @@
       </ComboBox>
 
       <CheckBox Grid.Row="4" Grid.Column="1"
+                Height="32"
                 Content="{DynamicResource Text.AddWorktree.Tracking.Toggle}"
-                IsChecked="{Binding SetTrackingBranch, Mode=TwoWay}"/>
+                IsChecked="{Binding SetTrackingBranch, Mode=TwoWay}"
+                IsVisible="{Binding RemoteBranches, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}"/>
     </Grid>
   </StackPanel>
 </UserControl>

From 503ac5b42cb6b42e193c98bb43f846cba2830fb1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 17 Dec 2025 10:47:04 +0800
Subject: [PATCH 07/51] refactor: use `EndsWith` instead of `Equals` to
 auto-find the tracking branch while creating worktree (#1983)

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

diff --git a/src/ViewModels/AddWorktree.cs b/src/ViewModels/AddWorktree.cs
index a1985d51f..5c7b21d25 100644
--- a/src/ViewModels/AddWorktree.cs
+++ b/src/ViewModels/AddWorktree.cs
@@ -129,7 +129,7 @@ private void AutoSelectTrackingBranch()
                 return;
 
             var name = string.IsNullOrEmpty(_selectedBranch) ? System.IO.Path.GetFileName(_path.TrimEnd('/', '\\')) : _selectedBranch;
-            var remoteBranch = RemoteBranches.Find(b => b.Substring(b.IndexOf('/') + 1).Equals(name, StringComparison.Ordinal));
+            var remoteBranch = RemoteBranches.Find(b => b.EndsWith(name, StringComparison.Ordinal));
             if (string.IsNullOrEmpty(remoteBranch))
                 remoteBranch = RemoteBranches[0];
 

From 2c968e4ca4c849530f5054564e3d3acb28d1f6e6 Mon Sep 17 00:00:00 2001
From: ybeapps <ybeapps@gmail.com>
Date: Wed, 17 Dec 2025 11:02:18 +0200
Subject: [PATCH 08/51] doc: update README.md - Mac app is signed now via
 homebrew (#1985)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eb370c3c6..7eab03f42 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@ For **macOS** users:
 * Thanks [@ybeapps](https://github.com/ybeapps) for making `SourceGit` available on `Homebrew`. You can simply install it with following command:
   ```shell
   brew tap ybeapps/homebrew-sourcegit
-  brew install --cask --no-quarantine sourcegit
+  brew install --cask sourcegit
   ```
 * If you want to install `SourceGit.app` from GitHub Release manually, you need run following command to make sure it works:
   ```shell

From cf528d6b96d5cde0778ba3b9de5f0fa3b1805427 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 18 Dec 2025 10:29:05 +0800
Subject: [PATCH 09/51] doc: update README.md for macOS users (#1988)

Signed-off-by: leo <longshuang@msn.cn>
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 7eab03f42..05bd7a46b 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,9 @@ For **macOS** users:
   ```shell
   sudo xattr -cr /Applications/SourceGit.app
   ```
+> [!NOTE]
+> macOS packages in the `Release` page of this project are all unsigned. If you are worried about potential security issues with the above command, you can download the signed package from the [distribution repository](https://github.com/ybeapps/homebrew-sourcegit/releases) provided by [@ybeapps](https://github.com/ybeapps) (there is no need to execute the above command while installing `SourceGit`).
+
 * Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your mac.
 * You can run `echo $PATH > ~/Library/Application\ Support/SourceGit/PATH` to generate a custom PATH env file to introduce `PATH` env to SourceGit.
 

From f7836c05930f3d3f364ed6f189e5038bcfb6aebd Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 18 Dec 2025 14:03:34 +0800
Subject: [PATCH 10/51] ux: prevent non-auto-hide scrollbar overlap contents
 (#1980) (#1794)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Styles.axaml     | 194 +++++++++++++++++++++++++++++++--
 src/Views/BranchTree.axaml     |   3 +-
 src/Views/Histories.axaml      |  19 +++-
 src/Views/SubmodulesView.axaml |   6 +-
 src/Views/TagsView.axaml       |   6 +-
 5 files changed, 210 insertions(+), 18 deletions(-)

diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 651bc9505..6294cdd9a 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -13,16 +13,6 @@
     </StackPanel>
   </Design.PreviewWith>
 
-  <Style Selector="ScrollBar">
-    <Style.Resources>
-      <x:Double x:Key="ScrollBarSize">12</x:Double>
-    </Style.Resources>
-
-    <Setter Property="AllowAutoHide" Value="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseAutoHideScrollBars, Mode=OneWay}"/>
-    <Setter Property="ShowDelay" Value="0:0:0.1"/>
-    <Setter Property="HideDelay" Value="0:0:0.2"/>
-  </Style>
-
   <Style Selector="Window">
     <Style.Resources>
       <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="Red"/>
@@ -245,6 +235,190 @@
     </Setter>
   </Style>
 
+  <Style Selector="ScrollBar">
+    <Setter Property="MinWidth" Value="12"/>
+    <Setter Property="MinHeight" Value="12"/>
+    <Setter Property="ShowDelay" Value="0:0:0.1"/>
+    <Setter Property="HideDelay" Value="0:0:0.2"/>
+
+    <Style Selector="^ /template/ RepeatButton">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}" />
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Padding="0" Background="{TemplateBinding Background}">
+            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                              Foreground="{TemplateBinding Foreground}"/>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^:horizontal">
+      <Setter Property="Height" Value="8" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="Transparent" UseLayoutRounding="False">
+            <Grid Name="PART_RootGrid" ColumnDefinitions="12,*,12">
+              <RepeatButton Name="PART_LineUpButton"
+                            Grid.Row="0" Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Focusable="False">
+                <Path Width="8" Height="8"
+                      Data="M16.32 6.96v10.13a.5.5 0 0 1-.78.41l-7.6-5.06a.5.5 0 0 1 0-.83l7.6-5.07a.5.5 0 0 1 .78.42Z"
+                      Fill="{DynamicResource Brush.FG2}"/>
+              </RepeatButton>
+              <Track Grid.Column="1"
+                     DeferThumbDrag="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                     Maximum="{TemplateBinding Maximum}"
+                     Minimum="{TemplateBinding Minimum}"
+                     Orientation="{TemplateBinding Orientation}"
+                     ViewportSize="{TemplateBinding ViewportSize}"
+                     Value="{TemplateBinding Value, Mode=TwoWay}">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_PageUpButton"
+                                MinWidth="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                CornerRadius="0"
+                                Focusable="False"/>
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_PageDownButton"
+                                MinWidth="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                CornerRadius="0"
+                                Focusable="False"/>
+                </Track.IncreaseButton>
+                <Thumb MinWidth="24" Height="8" VerticalAlignment="Center"/>
+              </Track>
+              <RepeatButton Name="PART_LineDownButton"
+                            Grid.Column="2"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Focusable="False">
+                <Path Width="8" Height="8"
+                      Data="M9 17.07V6.93c0-.4.45-.63.78-.41l7.6 5.06c.3.2.3.64 0 .84l-7.6 5.06a.5.5 0 0 1-.78-.41Z"
+                      Fill="{DynamicResource Brush.FG2}"/>
+              </RepeatButton>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^:vertical">
+      <Setter Property="Width" Value="8" />
+      <Setter Property="Template">
+        <ControlTemplate TargetType="ScrollBar">
+          <Border Background="Transparent" UseLayoutRounding="False">
+            <Grid RowDefinitions="12,*,12">
+              <RepeatButton Name="PART_LineUpButton"
+                            Grid.Row="0"
+                            VerticalAlignment="Center"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Focusable="False">
+                <Path Width="8" Height="8"
+                      Data="M17.08 16.32H6.95a.5.5 0 0 1-.41-.78l5.06-7.6c.2-.3.64-.3.83 0l5.07 7.6a.5.5 0 0 1-.42.78Z"
+                      Fill="{DynamicResource Brush.FG2}"/>
+              </RepeatButton>
+              <Track Grid.Row="1"
+                     DeferThumbDrag="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                     IsDirectionReversed="True"
+                     Maximum="{TemplateBinding Maximum}"
+                     Minimum="{TemplateBinding Minimum}"
+                     Orientation="{TemplateBinding Orientation}"
+                     ViewportSize="{TemplateBinding ViewportSize}"
+                     Value="{TemplateBinding Value, Mode=TwoWay}">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_PageUpButton"
+                                MinHeight="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                CornerRadius="0"
+                                Focusable="False"/>
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_PageDownButton"
+                                MinHeight="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                CornerRadius="0"
+                                Focusable="False" />
+                </Track.IncreaseButton>
+                <Thumb MinHeight="24" Width="8" HorizontalAlignment="Center"/>
+              </Track>
+              <RepeatButton Name="PART_LineDownButton"
+                            Grid.Row="2"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Focusable="False">
+                <Path Width="8" Height="8"
+                      Data="M6.95 7.72h10.13c.4 0 .64.45.42.78l-5.07 7.6a.5.5 0 0 1-.83 0L6.54 8.5a.5.5 0 0 1 .41-.78Z"
+                      Fill="{DynamicResource Brush.FG2}"/>
+              </RepeatButton>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^ /template/ Thumb">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Width" Duration="0:0:0.1" />
+          <DoubleTransition Property="Height" Duration="0:0:0.1" />
+        </Transitions>
+      </Setter>
+      <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Foreground}" CornerRadius="4" UseLayoutRounding="False" />
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <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" />
+      </Style>
+      <Style Selector="^:vertical /template/ Thumb">
+        <Setter Property="Width" Value="2" />
+      </Style>
+      <Style Selector="^:horizontal /template/ Thumb">
+        <Setter Property="Height" Value="2" />
+      </Style>
+    </Style>
+  </Style>
+
+  <Style Selector="ScrollViewer">
+    <Setter Property="Classes.static_scrollbar" Value="{Binding Source={x:Static vm:Preferences.Instance}, Path=!UseAutoHideScrollBars, Mode=OneWay}"/>
+  </Style>
+
+  <Style Selector="ScrollViewer.static_scrollbar">
+    <Setter Property="AllowAutoHide" Value="False"/>    
+    <Style Selector="^ /template/ ScrollContentPresenter#PART_ContentPresenter">
+      <Setter Property="Grid.RowSpan" Value="1"/>
+      <Setter Property="Grid.ColumnSpan" Value="1"/>
+    </Style>
+  </Style>
+
   <Style Selector="Path">
     <Setter Property="Fill" Value="{DynamicResource Brush.FG1}"/>
     <Setter Property="Stretch" Value="Uniform"/>
diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
index 0d122d606..a627a0d90 100644
--- a/src/Views/BranchTree.axaml
+++ b/src/Views/BranchTree.axaml
@@ -15,6 +15,7 @@
            SelectionMode="Multiple"
            SelectionChanged="OnNodesSelectionChanged"
            KeyDown="OnTreeKeyDown"
+           Padding="0,0,2,0"
            ContextRequested="OnTreeContextRequested">
     <ListBox.ItemsPanel>
       <ItemsPanelTemplate>
@@ -160,7 +161,7 @@
 
               <!-- Filter Mode Switcher -->
               <v:FilterModeSwitchButton Grid.Column="3"
-                                        Margin="0,0,12,0"
+                                        Margin="0,0,8,0"
                                         Mode="{Binding FilterMode}"/>
             </Grid>
           </Grid>
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index c07f88d14..9c98cd6b1 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -25,7 +25,8 @@
 
     <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
       <DataGrid x:Name="CommitListContainer"
-                Background="{DynamicResource Brush.Contents}"
+                Classes.static_scrollbar="{Binding Source={x:Static vm:Preferences.Instance}, Path=!UseAutoHideScrollBars, Mode=OneWay}"
+                Background="{DynamicResource Brush.Window}"
                 SelectionMode="Extended"
                 ItemsSource="{Binding Commits, Mode=OneWay}"
                 SelectedItem="{Binding AutoSelectedCommit, Mode=OneWay}"
@@ -51,7 +52,17 @@
           <SolidColorBrush x:Key="DataGridGridLinesBrush" Color="{DynamicResource Color.Border0}" />
         </DataGrid.Resources>
 
-        <DataGrid.Styles>
+        <DataGrid.Styles>     
+          <Style Selector="DataGrid.static_scrollbar">
+            <Style Selector="^ /template/ DataGridRowsPresenter#PART_RowsPresenter">
+              <Setter Property="Grid.RowSpan" Value="1" />
+              <Setter Property="Grid.ColumnSpan" Value="2" />
+            </Style>
+            <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
+              <Setter Property="Grid.ColumnSpan" Value="1" />
+            </Style>
+          </Style>
+          
           <Style Selector="DataGridColumnHeader">
             <Setter Property="MinHeight" Value="24"/>
             <Setter Property="Background" Value="{DynamicResource Brush.Window}"/>
@@ -93,6 +104,10 @@
               </ControlTemplate>
             </Setter>
           </Style>
+
+          <Style Selector="DataGridRowsPresenter">
+            <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
+          </Style>
         </DataGrid.Styles>
 
         <DataGrid.Columns>
diff --git a/src/Views/SubmodulesView.axaml b/src/Views/SubmodulesView.axaml
index 963ae1b65..ddc70f3c2 100644
--- a/src/Views/SubmodulesView.axaml
+++ b/src/Views/SubmodulesView.axaml
@@ -10,7 +10,7 @@
              x:Class="SourceGit.Views.SubmodulesView">
   <UserControl.DataTemplates>
     <DataTemplate DataType="vm:SubmoduleCollectionAsTree">
-      <ListBox Classes="repo_left_content_list" ItemsSource="{Binding Rows}" SelectionMode="Single">
+      <ListBox Classes="repo_left_content_list" Padding="0,0,2,0" ItemsSource="{Binding Rows}" SelectionMode="Single">
         <ListBox.Styles>
           <Style Selector="ListBoxItem">
             <Setter Property="CornerRadius" Value="4"/>
@@ -127,7 +127,7 @@
 
                 <Path Grid.Column="3"
                       Width="8" Height="8"
-                      Margin="0,0,12,0"
+                      Margin="0,0,8,0"
                       Fill="Goldenrod"
                       Data="{StaticResource Icons.Modified}"
                       IsVisible="{Binding IsDirty}"/>
@@ -235,7 +235,7 @@
                 <TextBlock Grid.Column="1" Text="{Binding Path}" ClipToBounds="True" TextTrimming="CharacterEllipsis"/>
                 <Path Grid.Column="2"
                       Width="8" Height="8"
-                      Margin="8,0,12,0"
+                      Margin="8,0,8,0"
                       Fill="Goldenrod"
                       Data="{StaticResource Icons.Modified}"
                       IsVisible="{Binding IsDirty}"/>
diff --git a/src/Views/TagsView.axaml b/src/Views/TagsView.axaml
index 7d79d04a3..220d78423 100644
--- a/src/Views/TagsView.axaml
+++ b/src/Views/TagsView.axaml
@@ -19,6 +19,7 @@
       <ListBox Classes="repo_left_content_list"
                ItemsSource="{Binding Rows}"
                SelectionMode="Multiple"
+               Padding="0,0,2,0"
                KeyDown="OnKeyDown"
                SelectionChanged="OnSelectionChanged"
                ContextRequested="OnTagsContextMenuRequested">
@@ -53,7 +54,7 @@
                 </TextBlock>
 
                 <Border Grid.Column="3" IsVisible="{Binding !IsFolder}">
-                  <v:FilterModeSwitchButton Margin="0,0,12,0" Mode="{Binding FilterMode}"/>
+                  <v:FilterModeSwitchButton Margin="0,0,8,0" Mode="{Binding FilterMode}"/>
                 </Border>
               </Grid>
             </Border>
@@ -65,6 +66,7 @@
     <DataTemplate DataType="vm:TagCollectionAsList">
       <ListBox Classes="repo_left_content_list"
                Margin="8,0,0,0"
+               Padding="0,0,2,0"
                ItemsSource="{Binding TagItems}"
                SelectionMode="Multiple"
                KeyDown="OnKeyDown"
@@ -104,7 +106,7 @@
                            Margin="8,0,0,0"
                            TextTrimming="CharacterEllipsis"/>
 
-                <v:FilterModeSwitchButton Grid.Column="2" Margin="0,0,12,0" Mode="{Binding FilterMode}"/>
+                <v:FilterModeSwitchButton Grid.Column="2" Margin="0,0,8,0" Mode="{Binding FilterMode}"/>
               </Grid>
             </Border>
           </DataTemplate>

From addafd5ffbf0df01de4a2fa83819f3b4889d7cd5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 18 Dec 2025 14:59:14 +0800
Subject: [PATCH 11/51] ux: commit list in `HISTORY` page will always turn
 `AllowAutoHide` off (#1980) (#1794)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Styles.axaml | 5 +++--
 src/Views/Histories.axaml  | 9 ++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 6294cdd9a..c48c4a171 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -240,6 +240,7 @@
     <Setter Property="MinHeight" Value="12"/>
     <Setter Property="ShowDelay" Value="0:0:0.1"/>
     <Setter Property="HideDelay" Value="0:0:0.2"/>
+    <Setter Property="Background" Value="Transparent"/>
 
     <Style Selector="^ /template/ RepeatButton">
       <Setter Property="Background" Value="Transparent" />
@@ -264,7 +265,7 @@
       <Setter Property="Height" Value="8" />
       <Setter Property="Template">
         <ControlTemplate>
-          <Border Background="Transparent" UseLayoutRounding="False">
+          <Border Background="{TemplateBinding Background}" UseLayoutRounding="False">
             <Grid Name="PART_RootGrid" ColumnDefinitions="12,*,12">
               <RepeatButton Name="PART_LineUpButton"
                             Grid.Row="0" Grid.Column="0"
@@ -318,7 +319,7 @@
       <Setter Property="Width" Value="8" />
       <Setter Property="Template">
         <ControlTemplate TargetType="ScrollBar">
-          <Border Background="Transparent" UseLayoutRounding="False">
+          <Border Background="{TemplateBinding Background}" UseLayoutRounding="False">
             <Grid RowDefinitions="12,*,12">
               <RepeatButton Name="PART_LineUpButton"
                             Grid.Row="0"
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 9c98cd6b1..5e1a00740 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -25,7 +25,7 @@
 
     <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
       <DataGrid x:Name="CommitListContainer"
-                Classes.static_scrollbar="{Binding Source={x:Static vm:Preferences.Instance}, Path=!UseAutoHideScrollBars, Mode=OneWay}"
+                ScrollViewer.AllowAutoHide="False"
                 Background="{DynamicResource Brush.Window}"
                 SelectionMode="Extended"
                 ItemsSource="{Binding Commits, Mode=OneWay}"
@@ -52,8 +52,8 @@
           <SolidColorBrush x:Key="DataGridGridLinesBrush" Color="{DynamicResource Color.Border0}" />
         </DataGrid.Resources>
 
-        <DataGrid.Styles>     
-          <Style Selector="DataGrid.static_scrollbar">
+        <DataGrid.Styles>
+          <Style Selector="DataGrid">
             <Style Selector="^ /template/ DataGridRowsPresenter#PART_RowsPresenter">
               <Setter Property="Grid.RowSpan" Value="1" />
               <Setter Property="Grid.ColumnSpan" Value="2" />
@@ -61,6 +61,9 @@
             <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
               <Setter Property="Grid.ColumnSpan" Value="1" />
             </Style>
+            <Style Selector="^ /template/ ScrollBar">
+              <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
+            </Style>
           </Style>
           
           <Style Selector="DataGridColumnHeader">

From e5788d0957c2c6e1e40aef14040780fb6474ca43 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 18 Dec 2025 15:34:07 +0800
Subject: [PATCH 12/51] fix: column headers mis-aligned with rows

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

diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 5e1a00740..01bcb3087 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -25,6 +25,7 @@
 
     <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
       <DataGrid x:Name="CommitListContainer"
+                Classes="static_scrollbar"
                 ScrollViewer.AllowAutoHide="False"
                 Background="{DynamicResource Brush.Window}"
                 SelectionMode="Extended"
@@ -53,13 +54,13 @@
         </DataGrid.Resources>
 
         <DataGrid.Styles>
-          <Style Selector="DataGrid">
+          <Style Selector="DataGrid.static_scrollbar">
             <Style Selector="^ /template/ DataGridRowsPresenter#PART_RowsPresenter">
               <Setter Property="Grid.RowSpan" Value="1" />
               <Setter Property="Grid.ColumnSpan" Value="2" />
             </Style>
             <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
-              <Setter Property="Grid.ColumnSpan" Value="1" />
+              <Setter Property="Grid.Column" Value="0" />
             </Style>
             <Style Selector="^ /template/ ScrollBar">
               <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
@@ -187,7 +188,7 @@
                             Opacity="{Binding IsMerged, Converter={x:Static c:BoolConverters.IsMergedToOpacity}}"
                             IsHitTestVisible="False"/>
 
-                  <Border Grid.Column="1" Padding="8,0,4,0" ClipToBounds="True">
+                  <Border Grid.Column="1" Padding="8,0" ClipToBounds="True">
                     <TextBlock Text="{Binding Author.Name}"
                                FontWeight="{Binding IsCurrentHead, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
                                Opacity="{Binding IsMerged, Converter={x:Static c:BoolConverters.IsMergedToOpacity}}"

From a6a0c3b7533dc91ca5481163d09cfbbf3c8f6bfc Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 18 Dec 2025 15:41:08 +0800
Subject: [PATCH 13/51] ux: layout change for `Welcome` page

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

diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index 7d23c60a9..4527905af 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -107,7 +107,7 @@
           <DataTemplate DataType="vm:RepositoryNode">
             <Grid Background="Transparent"
                   Height="30"
-                  ColumnDefinitions="16,18,*,Auto,16"
+                  ColumnDefinitions="16,18,*,Auto,8"
                   Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
                   ClipToBounds="True"
                   ContextRequested="OnTreeNodeContextRequested"

From 0e08d8ef0b8f95e6a17bc305ad6a9e4750fe5e94 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 19 Dec 2025 10:22:54 +0800
Subject: [PATCH 14/51] project: upgrade `AvaloniaUI` to `11.3.10`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/SourceGit.csproj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 34f2c0163..165fdc46c 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -43,12 +43,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.9" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="Avalonia" Version="11.3.10" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.10" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.10" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.10" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.10" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.10" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.3.0" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.8.0-beta.1" />

From 910431ab408f0ffffb2a12c4477515402086145b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 19 Dec 2025 10:27:42 +0800
Subject: [PATCH 15/51] enhance: do not refresh commit details if the new
 selected commit points to the same revision with old one (#1989)

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

diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 0c2f16785..f0862c0f8 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -53,6 +53,9 @@ public Models.Commit Commit
             get => _commit;
             set
             {
+                if (_commit != null && value != null && _commit.SHA.Equals(value.SHA, StringComparison.Ordinal))
+                    return;
+
                 if (SetProperty(ref _commit, value))
                     Refresh();
             }

From 02606723b45cfc300af92eac1714651fbf123503 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 19 Dec 2025 10:36:45 +0800
Subject: [PATCH 16/51] enhance: auto-fetching will respect git configuration
 (#1990)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Fetch.cs        | 11 +++++++++++
 src/ViewModels/Repository.cs | 14 +++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/Commands/Fetch.cs b/src/Commands/Fetch.cs
index 9a599f821..914361257 100644
--- a/src/Commands/Fetch.cs
+++ b/src/Commands/Fetch.cs
@@ -22,6 +22,17 @@ public Fetch(string repo, string remote, bool noTags, bool force)
             Args = builder.ToString();
         }
 
+        public Fetch(string repo, string remote)
+        {
+            _remote = remote;
+
+            WorkingDirectory = repo;
+            Context = repo;
+            RaiseError = false;
+
+            Args = $"fetch --progress --verbose {remote}";
+        }
+
         public Fetch(string repo, Models.Branch local, Models.Branch remote)
         {
             _remote = remote.Remote;
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index e90ad246c..448a4ba76 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1825,6 +1825,8 @@ private void AutoFetchByTimer(object sender)
 
         private async Task AutoFetchOnUIThread()
         {
+            CommandLog log = null;
+
             try
             {
                 if (_settings is not { EnableAutoFetch: true })
@@ -1849,20 +1851,24 @@ private async Task AutoFetchOnUIThread()
                 foreach (var r in _remotes)
                     remotes.Add(r.Name);
 
+                if (remotes.Count == 0)
+                    return;
+
                 IsAutoFetching = true;
+                log = CreateLog("Auto-Fetch");
 
                 if (_settings.FetchAllRemotes)
                 {
                     foreach (var remote in remotes)
-                        await new Commands.Fetch(FullPath, remote, false, false) { RaiseError = false }.RunAsync();
+                        await new Commands.Fetch(FullPath, remote).Use(log).RunAsync();
                 }
-                else if (remotes.Count > 0)
+                else
                 {
                     var remote = string.IsNullOrEmpty(_settings.DefaultRemote) ?
                         remotes.Find(x => x.Equals(_settings.DefaultRemote, StringComparison.Ordinal)) :
                         remotes[0];
 
-                    await new Commands.Fetch(FullPath, remote, false, false) { RaiseError = false }.RunAsync();
+                    await new Commands.Fetch(FullPath, remote).Use(log).RunAsync();
                 }
 
                 _lastFetchTime = DateTime.Now;
@@ -1872,6 +1878,8 @@ private async Task AutoFetchOnUIThread()
             {
                 // Ignore all exceptions.
             }
+
+            log?.Complete();
         }
 
         private readonly bool _isWorktree = false;

From b7bd3e6653f5619990aa9b49bd6766725503d24c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 19 Dec 2025 11:36:23 +0800
Subject: [PATCH 17/51] ux: apply workspace color to `Move to Workspace`
 context menu entry in launcher's tab

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

diff --git a/src/Views/LauncherTabBar.axaml.cs b/src/Views/LauncherTabBar.axaml.cs
index 545f0bf66..8d044afc0 100644
--- a/src/Views/LauncherTabBar.axaml.cs
+++ b/src/Views/LauncherTabBar.axaml.cs
@@ -346,10 +346,12 @@ private void OnTabContextRequested(object sender, ContextRequestedEventArgs e)
                         {
                             var dupWs = ws;
                             var isCurrent = dupWs == vm.ActiveWorkspace;
+                            var icon = App.CreateMenuIcon(isCurrent ? "Icons.Check" : "Icons.Workspace");
+                            icon.Fill = dupWs.Brush;
 
                             var target = new MenuItem();
                             target.Header = ws.Name;
-                            target.Icon = App.CreateMenuIcon(isCurrent ? "Icons.Check" : "Icons.Workspace");
+                            target.Icon = icon;
                             target.Click += (_, ev) =>
                             {
                                 if (!isCurrent)

From 9ac6afac0510d3106bc9e826ab5e3bdb4b9df232 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 19 Dec 2025 11:45:58 +0800
Subject: [PATCH 18/51] fix: launche's title does not update when last active
 page is the first one

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Launcher.cs | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 4d3a59111..161468634 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -35,7 +35,7 @@ public LauncherPage ActivePage
             set
             {
                 if (SetProperty(ref _activePage, value))
-                    PostActivePageChanged(value?.Data as Repository);
+                    PostActivePageChanged();
             }
         }
 
@@ -86,10 +86,14 @@ public Launcher(string startupRepo)
             }
 
             var activeIdx = ActiveWorkspace.ActiveIdx;
-            if (activeIdx >= 0 && activeIdx < Pages.Count)
+            if (activeIdx > 0 && activeIdx < Pages.Count)
+            {
                 ActivePage = Pages[activeIdx];
-            else
-                ActivePage = Pages[0];
+                return;
+            }
+
+            ActivePage = Pages[0];
+            PostActivePageChanged();
         }
 
         public void Quit()
@@ -222,7 +226,7 @@ public void CloseTab(LauncherPage page)
                     last.Popup?.Cleanup();
                     last.Popup = null;
 
-                    PostActivePageChanged(null);
+                    PostActivePageChanged();
                     GC.Collect();
                 }
                 else
@@ -338,7 +342,7 @@ public void OpenRepositoryInTab(RepositoryNode node, LauncherPage page)
             }
 
             if (_activePage == page)
-                PostActivePageChanged(repo);
+                PostActivePageChanged();
             else
                 ActivePage = page;
         }
@@ -433,7 +437,7 @@ private void CloseRepositoryInTab(LauncherPage page, bool removeFromWorkspace =
             page.Data = null;
         }
 
-        private void PostActivePageChanged(Repository repo)
+        private void PostActivePageChanged()
         {
             if (_ignoreIndexChange)
                 return;
@@ -446,8 +450,10 @@ private void PostActivePageChanged(Repository repo)
                     builder.Append('[').Append(_activeWorkspace.Name).Append("] ");
             }
 
-            if (_activePage is { Data: Repository })
+            if (_activePage is { Data: Repository repo })
             {
+                _activeWorkspace.ActiveIdx = _activeWorkspace.Repositories.IndexOf(repo.FullPath);
+
                 var node = _activePage.Node;
                 var name = node.Name;
                 var path = node.Id;
@@ -469,9 +475,6 @@ private void PostActivePageChanged(Repository repo)
 
             CancelCommandPalette();
             Title = builder.ToString();
-
-            if (repo != null)
-                _activeWorkspace.ActiveIdx = _activeWorkspace.Repositories.IndexOf(repo.FullPath);
         }
 
         private Workspace _activeWorkspace = null;

From 44fc98c070e1b40e66d3d783f6d93c17ede7c3cb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 19 Dec 2025 18:16:29 +0800
Subject: [PATCH 19/51] feature: auto-detect HTTPS website for
 `git@<host>:<repo>` formatted remote (#1636)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryRemotes.cs | 10 +++++
 src/Models/CommitLink.cs     |  2 +
 src/Models/HTTPSValidator.cs | 84 ++++++++++++++++++++++++++++++++++++
 src/Models/Remote.cs         |  5 ++-
 4 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 src/Models/HTTPSValidator.cs

diff --git a/src/Commands/QueryRemotes.cs b/src/Commands/QueryRemotes.cs
index bd42aabf1..48d7040a0 100644
--- a/src/Commands/QueryRemotes.cs
+++ b/src/Commands/QueryRemotes.cs
@@ -40,6 +40,16 @@ public QueryRemotes(string repo)
                 if (outs.Find(x => x.Name == remote.Name) != null)
                     continue;
 
+                if (remote.URL.StartsWith("git@", StringComparison.Ordinal))
+                {
+                    var hostEnd = remote.URL.IndexOf(':', 4);
+                    if (hostEnd > 4)
+                    {
+                        var host = remote.URL.Substring(4, hostEnd - 4);
+                        Models.HTTPSValidator.Add(host);
+                    }
+                }
+
                 outs.Add(remote);
             }
 
diff --git a/src/Models/CommitLink.cs b/src/Models/CommitLink.cs
index e7c3f697a..fa78f206c 100644
--- a/src/Models/CommitLink.cs
+++ b/src/Models/CommitLink.cs
@@ -40,6 +40,8 @@ public static List<CommitLink> Get(List<Remote> remotes)
                         outs.Add(new($"Gitea ({route})", $"{link}/commit/"));
                     else if (host.Equals("git.sr.ht", StringComparison.Ordinal))
                         outs.Add(new($"sourcehut ({route})", $"{link}/commit/"));
+                    else if (host.Equals("gitcode.com", StringComparison.Ordinal))
+                        outs.Add(new($"GitCode ({route})", $"{link}/commit/"));
                 }
             }
 
diff --git a/src/Models/HTTPSValidator.cs b/src/Models/HTTPSValidator.cs
new file mode 100644
index 000000000..014207c21
--- /dev/null
+++ b/src/Models/HTTPSValidator.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Security;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SourceGit.Models
+{
+    public static class HTTPSValidator
+    {
+        public static void Add(string host)
+        {
+            lock (_syncLock)
+            {
+                // Already checked
+                if (_hosts.ContainsKey(host))
+                    return;
+
+                // Temporarily mark as supported to avoid duplicate checks
+                _hosts.Add(host, true);
+
+                // Well-known hosts always support HTTPS
+                if (host.Contains("github.com", StringComparison.Ordinal) ||
+                    host.Contains("gitlab", StringComparison.Ordinal) ||
+                    host.Contains("azure.com", StringComparison.Ordinal) ||
+                    host.Equals("gitee.com", StringComparison.Ordinal) ||
+                    host.Equals("bitbucket.org", StringComparison.Ordinal) ||
+                    host.Equals("gitea.org", StringComparison.Ordinal) ||
+                    host.Equals("gitcode.com", StringComparison.Ordinal))
+                    return;
+            }
+
+            Task.Run(() =>
+            {
+                var supported = false;
+
+                try
+                {
+                    using (var client = new TcpClient())
+                    {
+                        client.ConnectAsync(host, 443).Wait(3000);
+                        if (!client.Connected)
+                        {
+                            client.ConnectAsync(host, 80).Wait(3000);
+                            supported = !client.Connected; // If the network is not available, assume HTTPS is supported
+                        }
+                        else
+                        {
+                            using (var ssl = new SslStream(client.GetStream(), false, (s, cert, chain, errs) => true))
+                            {
+                                ssl.AuthenticateAsClient(host);
+                                supported = ssl.IsAuthenticated; // Hand-shake succeeded
+                            }
+                        }
+                    }
+                }
+                catch
+                {
+                    // Ignore exceptions
+                }
+
+                lock (_syncLock)
+                {
+                    _hosts[host] = supported;
+                }
+            });
+        }
+
+        public static bool IsSupported(string host)
+        {
+            lock (_syncLock)
+            {
+                if (_hosts.TryGetValue(host, out var supported))
+                    return supported;
+
+                return false;
+            }
+        }
+
+        private static Lock _syncLock = new();
+        private static Dictionary<string, bool> _hosts = new();
+    }
+}
diff --git a/src/Models/Remote.cs b/src/Models/Remote.cs
index 3550a4e56..d1fa2cb4d 100644
--- a/src/Models/Remote.cs
+++ b/src/Models/Remote.cs
@@ -78,7 +78,10 @@ public bool TryGetVisitURL(out string url)
             var match = REG_TO_VISIT_URL_CAPTURE().Match(URL);
             if (match.Success)
             {
-                url = $"https://{match.Groups[1].Value}/{match.Groups[2].Value}";
+                var host = match.Groups[1].Value;
+                var supportHTTPS = HTTPSValidator.IsSupported(host);
+                var scheme = supportHTTPS ? "https" : "http";
+                url = $"{scheme}://{host}/{match.Groups[2].Value}";
                 return true;
             }
 

From 5f2984f983defb6f240e40e48e3251750ba26469 Mon Sep 17 00:00:00 2001
From: cdammanintopix <63319198+cdammanintopix@users.noreply.github.com>
Date: Fri, 19 Dec 2025 11:28:08 +0100
Subject: [PATCH 20/51] fix: crash when the pre-push hook is a broken symlink
 (#1991)

---
 src/ViewModels/Repository.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 448a4ba76..1aaa6bd9e 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -644,8 +644,15 @@ public bool IsLFSEnabled()
             if (!File.Exists(path))
                 return false;
 
-            var content = File.ReadAllText(path);
-            return content.Contains("git lfs pre-push");
+            try
+            {
+                var content = File.ReadAllText(path);
+                return content.Contains("git lfs pre-push");
+            }
+            catch
+            {
+                return false;
+            }
         }
 
         public async Task InstallLFSAsync()

From 553b157deb1b05f00b4428c4cc52d17db61ef2df Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 20 Dec 2025 11:35:14 +0800
Subject: [PATCH 21/51] code_style: remove Rider warnings

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

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 14014ab74..ff3438124 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -121,8 +121,8 @@ protected override void OnDataContextChanged(EventArgs e)
                 InvalidateMeasure();
             }
 
-            private readonly bool _usePresenter = false;
-            private readonly bool _isOld = false;
+            private readonly bool _usePresenter;
+            private readonly bool _isOld;
         }
 
         public class LineModifyTypeMargin : AbstractMargin
@@ -307,7 +307,7 @@ private IBrush GetBrushByLineType(Models.TextDiffLineType type)
                 };
             }
 
-            private readonly ThemedTextDiffPresenter _presenter = null;
+            private readonly ThemedTextDiffPresenter _presenter;
         }
 
         public class LineStyleTransformer(ThemedTextDiffPresenter presenter) : DocumentColorizingTransformer
@@ -480,7 +480,7 @@ public ThemedTextDiffPresenter(TextArea area, TextDocument doc) : base(area, doc
 
         public void GotoChange(ViewModels.BlockNavigationDirection direction)
         {
-            if (DataContext is not ViewModels.TextDiffContext ctx)
+            if (DataContext is not ViewModels.TextDiffContext)
                 return;
 
             var block = BlockNavigation.Goto(direction);
@@ -871,11 +871,11 @@ private async Task CopyWithoutIndicatorsAsync()
             await App.CopyTextAsync(builder.ToString());
         }
 
-        private bool _execSizeChanged = false;
-        private TextMate.Installation _textMate = null;
+        private bool _execSizeChanged;
+        private TextMate.Installation _textMate;
         private TextLocation _lastSelectStart = TextLocation.Empty;
         private TextLocation _lastSelectEnd = TextLocation.Empty;
-        private LineStyleTransformer _lineStyleTransformer = null;
+        private LineStyleTransformer _lineStyleTransformer;
     }
 
     public class CombinedTextDiffPresenter : ThemedTextDiffPresenter
@@ -1049,7 +1049,7 @@ private void OnTextViewScrollChanged(object sender, ScrollChangedEventArgs e)
                 TrySetChunk(null);
         }
 
-        private ScrollViewer _scrollViewer = null;
+        private ScrollViewer _scrollViewer;
     }
 
     public class SingleSideTextDiffPresenter : ThemedTextDiffPresenter
@@ -1257,7 +1257,7 @@ private void OnBlockNavigationPropertyChanged(object sender, PropertyChangedEven
                 TextArea?.TextView?.Redraw();
         }
 
-        private ScrollViewer _scrollViewer = null;
+        private ScrollViewer _scrollViewer;
     }
 
     public class TextDiffViewMinimap : Control
@@ -1356,10 +1356,9 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
             if (range == null || range.End == 0)
                 return;
 
-            var total = 0;
+            int total;
             if (DataContext is ViewModels.TwoSideTextDiff twoSideDiff)
             {
-                var halfWidth = Bounds.Width * 0.5;
                 total = Math.Max(twoSideDiff.Old.Count, twoSideDiff.New.Count);
             }
             else if (DataContext is ViewModels.CombinedTextDiff combined)
@@ -1380,7 +1379,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
                 return;
 
             var line = Math.Max(1, Math.Min(total, (int)Math.Ceiling(pressedY * total / height)));
-            if (this.Parent is Control parent)
+            if (Parent is Control parent)
                 parent.FindLogicalDescendantOfType<ThemedTextDiffPresenter>()?.ScrollToLine(line);
 
             e.Handled = true;

From b84b79322f4b8b35531b6480cc1355dbb4d975ca Mon Sep 17 00:00:00 2001
From: Sina Hinderks <sina@hinderks.net>
Date: Sat, 20 Dec 2025 04:38:06 +0100
Subject: [PATCH 22/51] fix: stage/discard/unstage hunk (#1996)

There is a regression bug regarding staging, discarding, and unstaging
hunks.  Depending on the data, these actions may be ignored or only
partially executed.

The following script generates a repository in the current directory
(named after the current directory) with four examples.  Save the script
as `create-hunk-regression.sh`, make it executable with `chmod +x
create-hunk-regression.sh`, and start it with
`./create-hunk-regression.sh`.  (Tested on Linux, should also work on
Windows.)

```bash
#!/usr/bin/env bash

set -e

dir=$(basename $(pwd))

rm -rf "$dir"
git init -b main "$dir" && cd "$dir"

echo -n '1n2n3n4n' | tr 'rn' '\r\n' > cannot-stage-hunks.txt
echo -n '2rn3rn' | tr 'rn' '\r\n' > partially-stages-hunks.txt
echo -n 'test1rnrnrnrntest3rn' | tr 'rn' '\r\n' > partially-stages-or-discards-hunk.txt

echo -n '1rn2rn3rn4rn' | tr 'rn' '\r\n' > cannot-unstage-hunks.txt

git add .
git commit -m 'initial commit'

echo -n '1rn2n3n4rn' | tr 'rn' '\r\n' > cannot-stage-hunks.txt
echo -n '1rn2rn3rn4rn' | tr 'rn' '\r\n' > partially-stages-hunks.txt
echo -n 'test1rnrntest2rnrntest3rn' | tr 'rn' '\r\n' > partially-stages-or-discards-hunk.txt

echo -n '1n2rn3rn4n' | tr 'rn' '\r\n' > cannot-unstage-hunks.txt

git add cannot-unstage-hunks.txt
```

For the examples to fully work you should configure Git/SourceGit the
following way:

  - set `core.autocrlf` to `false`
  - do not enable `--ignore-cr-at-eol` in diff
  - do not ignore wwhitespace changes

This regression was introduced in commit 5c9d96, where breaking up the
diff into lines was changed from explicitly doing it to using the stream
function `ReadLineAsync`.  Whereas the explicit code handled CR and LF
correctly, the stream function handles CR, CR/LF and LF the same way, so
that for Windows newlines (CR/LF) the CR will be lost.

The fix for this regression is going back to the explicit code and
ignoring `ReadLineAsync` for reading diffs.

This should fix at least partially issues #1950 and #1995.
---
 src/Commands/Diff.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Commands/Diff.cs b/src/Commands/Diff.cs
index 3fdc62259..680aff63d 100644
--- a/src/Commands/Diff.cs
+++ b/src/Commands/Diff.cs
@@ -46,9 +46,22 @@ public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespa
                 proc.StartInfo = CreateGitStartInfo(true);
                 proc.Start();
 
-                while (await proc.StandardOutput.ReadLineAsync().ConfigureAwait(false) is { } line)
+                var text = await proc.StandardOutput.ReadToEndAsync().ConfigureAwait(false);
+
+                var start = 0;
+                var end = text.IndexOf('\n', start);
+                while (end > 0)
+                {
+                    var line = text[start..end];
                     ParseLine(line);
 
+                    start = end + 1;
+                    end = text.IndexOf('\n', start);
+                }
+
+                if (start < text.Length)
+                    ParseLine(text[start..]);
+
                 await proc.WaitForExitAsync().ConfigureAwait(false);
             }
             catch

From a1ff375242f77b6954e36652784ab425c09c4f18 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 20 Dec 2025 11:45:51 +0800
Subject: [PATCH 23/51] ux: do not show repository's path in window title
 (#1993)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Launcher.cs | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 161468634..fe684c0fa 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -443,44 +443,28 @@ private void PostActivePageChanged()
                 return;
 
             var builder = new StringBuilder(512);
-            if (_activeWorkspace != null)
-            {
-                var workspaces = Preferences.Instance.Workspaces;
-                if (workspaces.Count == 0 || workspaces.Count > 1 || workspaces[0] != _activeWorkspace)
-                    builder.Append('[').Append(_activeWorkspace.Name).Append("] ");
-            }
+            var workspaces = Preferences.Instance.Workspaces;
+            if (workspaces.Count == 0 || workspaces.Count > 1 || workspaces[0] != _activeWorkspace)
+                builder.Append('[').Append(_activeWorkspace.Name).Append("] ");
 
             if (_activePage is { Data: Repository repo })
             {
                 _activeWorkspace.ActiveIdx = _activeWorkspace.Repositories.IndexOf(repo.FullPath);
-
-                var node = _activePage.Node;
-                var name = node.Name;
-                var path = node.Id;
-
-                if (!OperatingSystem.IsWindows())
-                {
-                    var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-                    var prefixLen = home.EndsWith('/') ? home.Length - 1 : home.Length;
-                    if (path.StartsWith(home, StringComparison.Ordinal))
-                        path = $"~{path.AsSpan(prefixLen)}";
-                }
-
-                builder.Append(name).Append(" (").Append(path).Append(')');
+                builder.Append(_activePage.Node.Name);
             }
             else
             {
                 builder.Append("Repositories");
             }
 
-            CancelCommandPalette();
             Title = builder.ToString();
+            CancelCommandPalette();
         }
 
-        private Workspace _activeWorkspace = null;
-        private LauncherPage _activePage = null;
-        private bool _ignoreIndexChange = false;
+        private Workspace _activeWorkspace;
+        private LauncherPage _activePage;
+        private bool _ignoreIndexChange;
         private string _title = string.Empty;
-        private ICommandPalette _commandPalette = null;
+        private ICommandPalette _commandPalette;
     }
 }

From 9b87f7b819bf9d4ffef678261d680d767b1c263d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 20 Dec 2025 12:00:22 +0800
Subject: [PATCH 24/51] enhance: starts filesystem watcher in another thread to
 avoid UI blocking (#1992)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/Watcher.cs | 44 +++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index 843744724..e7684e2c9 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace SourceGit.Models
 {
@@ -27,6 +28,7 @@ public Watcher(IRepository repo, string fullpath, string gitDir)
         {
             _repo = repo;
             _root = new DirectoryInfo(fullpath).FullName;
+            _watchers = new List<FileSystemWatcher>();
 
             var testGitDir = new DirectoryInfo(Path.Combine(fullpath, ".git")).FullName;
             var desiredDir = new DirectoryInfo(gitDir).FullName;
@@ -41,7 +43,7 @@ public Watcher(IRepository repo, string fullpath, string gitDir)
                 combined.Renamed += OnRepositoryChanged;
                 combined.Changed += OnRepositoryChanged;
                 combined.Deleted += OnRepositoryChanged;
-                combined.EnableRaisingEvents = true;
+                combined.EnableRaisingEvents = false;
 
                 _watchers.Add(combined);
             }
@@ -56,7 +58,7 @@ public Watcher(IRepository repo, string fullpath, string gitDir)
                 wc.Renamed += OnWorkingCopyChanged;
                 wc.Changed += OnWorkingCopyChanged;
                 wc.Deleted += OnWorkingCopyChanged;
-                wc.EnableRaisingEvents = true;
+                wc.EnableRaisingEvents = false;
 
                 var git = new FileSystemWatcher();
                 git.Path = gitDir;
@@ -67,13 +69,27 @@ public Watcher(IRepository repo, string fullpath, string gitDir)
                 git.Renamed += OnGitDirChanged;
                 git.Changed += OnGitDirChanged;
                 git.Deleted += OnGitDirChanged;
-                git.EnableRaisingEvents = true;
+                git.EnableRaisingEvents = false;
 
                 _watchers.Add(wc);
                 _watchers.Add(git);
             }
 
             _timer = new Timer(Tick, null, 100, 100);
+
+            // Starts filesystem watchers in another thread to avoid UI blocking
+            Task.Run(() =>
+            {
+                try
+                {
+                    foreach (var watcher in _watchers)
+                        watcher.EnableRaisingEvents = true;
+                }
+                catch
+                {
+                    // Ignore exceptions. This may occur while `Dispose` is called.
+                }
+            });
         }
 
         public IDisposable Lock()
@@ -322,16 +338,16 @@ private bool IsInSubmodule(string folder)
             return IsInSubmodule(parent);
         }
 
-        private readonly IRepository _repo = null;
-        private readonly string _root = null;
-        private List<FileSystemWatcher> _watchers = [];
-        private Timer _timer = null;
-
-        private long _lockCount = 0;
-        private long _updateWC = 0;
-        private long _updateBranch = 0;
-        private long _updateSubmodules = 0;
-        private long _updateStashes = 0;
-        private long _updateTags = 0;
+        private readonly IRepository _repo;
+        private readonly string _root;
+        private List<FileSystemWatcher> _watchers;
+        private Timer _timer;
+
+        private long _lockCount;
+        private long _updateWC;
+        private long _updateBranch;
+        private long _updateSubmodules;
+        private long _updateStashes;
+        private long _updateTags;
     }
 }

From a3fbe09b8dd8fa13cf709340636c4064f51f40af Mon Sep 17 00:00:00 2001
From: AquariusStar <48148723+AquariusStar@users.noreply.github.com>
Date: Sun, 21 Dec 2025 05:02:09 +0300
Subject: [PATCH 25/51] localization: update Russian translate (#1997)

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

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index dafade49b..35d283226 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -594,6 +594,7 @@
   <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Использовать фиксированную ширину табуляции в строке заголовка.</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Использовать системное окно</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">ИНСТРУМЕНТ СРАВНЕНИЙ/СЛИЯНИЯ</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.DiffArgs" xml:space="preserve">Аргументы сравнения</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.DiffArgs.Tip" xml:space="preserve">Доступны переменные: $LOCAL, $REMOTE</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.MergeArgs" xml:space="preserve">Слить аргументы</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.MergeArgs.Tip" xml:space="preserve">Доступны переменные: $BASE, $LOCAL, $REMOTE, $MERGED</x:String>

From 50f8e0c7963aff0753e5c111897199898d8c9170 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 02:02:21 +0000
Subject: [PATCH 26/51] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index e917c8659..990444b9f 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -765,14 +765,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.89%25-yellow)
-
-<details>
-<summary>Missing keys in ru_RU.axaml</summary>
-
-- Text.Preferences.DiffMerge.DiffArgs
-
-</details>
+### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
 ### ![ta__IN](https://img.shields.io/badge/ta__IN-74.97%25-red)
 

From eef1dcccbf7dd49473cbc39668d8a3890845e62b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 22 Dec 2025 10:39:55 +0800
Subject: [PATCH 27/51] fix: crash while reading JetBrains Toolbox's
 `state.json` (#1999)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/ExternalTool.cs | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/Models/ExternalTool.cs b/src/Models/ExternalTool.cs
index bd04f2f90..0f272ab35 100644
--- a/src/Models/ExternalTool.cs
+++ b/src/Models/ExternalTool.cs
@@ -180,17 +180,24 @@ public void FindJetBrainsFromToolbox(Func<string> platformFinder)
             var state = Path.Combine(platformFinder(), "state.json");
             if (File.Exists(state))
             {
-                using var stream = File.OpenRead(state);
-                var stateData = JsonSerializer.Deserialize(stream, JsonCodeGen.Default.JetBrainsState);
-                foreach (var tool in stateData.Tools)
+                try
                 {
-                    if (exclude.Contains(tool.ToolId.ToLowerInvariant()))
-                        continue;
-
-                    Tools.Add(new ExternalTool(
-                        $"{tool.DisplayName} {tool.DisplayVersion}",
-                        supportedIcons.Contains(tool.ProductCode) ? $"JetBrains/{tool.ProductCode}" : "JetBrains/JB",
-                        Path.Combine(tool.InstallLocation, tool.LaunchCommand)));
+                    using var stream = File.OpenRead(state);
+                    var stateData = JsonSerializer.Deserialize(stream, JsonCodeGen.Default.JetBrainsState);
+                    foreach (var tool in stateData.Tools)
+                    {
+                        if (exclude.Contains(tool.ToolId.ToLowerInvariant()))
+                            continue;
+
+                        Tools.Add(new ExternalTool(
+                            $"{tool.DisplayName} {tool.DisplayVersion}",
+                            supportedIcons.Contains(tool.ProductCode) ? $"JetBrains/{tool.ProductCode}" : "JetBrains/JB",
+                            Path.Combine(tool.InstallLocation, tool.LaunchCommand)));
+                    }
+                }
+                catch
+                {
+                    // Ignore exceptions.
                 }
             }
         }

From 4692df985f52cb549396737d69cce62e3d402ff1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 22 Dec 2025 12:02:26 +0800
Subject: [PATCH 28/51] feature: show total changes in revision compare and
 branch compare

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/BranchCompare.cs   |  8 ++++++++
 src/ViewModels/RevisionCompare.cs |  8 ++++++++
 src/Views/BranchCompare.axaml     | 12 +++++++++++-
 src/Views/RevisionCompare.axaml   | 12 +++++++++++-
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/ViewModels/BranchCompare.cs b/src/ViewModels/BranchCompare.cs
index e7f17e490..7c6a484d4 100644
--- a/src/ViewModels/BranchCompare.cs
+++ b/src/ViewModels/BranchCompare.cs
@@ -43,6 +43,12 @@ public Models.Commit ToHead
             private set => SetProperty(ref _toHead, value);
         }
 
+        public int TotalChanges
+        {
+            get => _totalChanges;
+            private set => SetProperty(ref _totalChanges, value);
+        }
+
         public List<Models.Change> VisibleChanges
         {
             get => _visibleChanges;
@@ -175,6 +181,7 @@ private void Refresh()
 
                 Dispatcher.UIThread.Post(() =>
                 {
+                    TotalChanges = _changes.Count;
                     VisibleChanges = visible;
                     IsLoading = false;
 
@@ -214,6 +221,7 @@ private void RefreshVisible()
         private Models.Branch _to = null;
         private Models.Commit _baseHead = null;
         private Models.Commit _toHead = null;
+        private int _totalChanges = 0;
         private List<Models.Change> _changes = null;
         private List<Models.Change> _visibleChanges = null;
         private List<Models.Change> _selectedChanges = null;
diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs
index 4de7b16d6..540338cc4 100644
--- a/src/ViewModels/RevisionCompare.cs
+++ b/src/ViewModels/RevisionCompare.cs
@@ -28,6 +28,12 @@ public object EndPoint
 
         public bool CanSaveAsPatch { get; }
 
+        public int TotalChanges
+        {
+            get => _totalChanges;
+            private set => SetProperty(ref _totalChanges, value);
+        }
+
         public List<Models.Change> VisibleChanges
         {
             get => _visibleChanges;
@@ -182,6 +188,7 @@ private void Refresh()
 
                 Dispatcher.UIThread.Post(() =>
                 {
+                    TotalChanges = _changes.Count;
                     VisibleChanges = visible;
                     IsLoading = false;
 
@@ -202,6 +209,7 @@ private string GetSHA(object obj)
         private bool _isLoading = true;
         private object _startPoint = null;
         private object _endPoint = null;
+        private int _totalChanges = 0;
         private List<Models.Change> _changes = null;
         private List<Models.Change> _visibleChanges = null;
         private List<Models.Change> _selectedChanges = null;
diff --git a/src/Views/BranchCompare.axaml b/src/Views/BranchCompare.axaml
index 64f8b8163..f222d2546 100644
--- a/src/Views/BranchCompare.axaml
+++ b/src/Views/BranchCompare.axaml
@@ -93,7 +93,7 @@
           <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
-        <Grid Grid.Column="0" RowDefinitions="26,*">
+        <Grid Grid.Column="0" RowDefinitions="26,*,26">
           <!-- Search & Display Mode -->
           <Grid Grid.Row="0" ColumnDefinitions="*,18">
             <TextBox Grid.Column="0"
@@ -137,6 +137,16 @@
                          Width="48" Height="48"
                          HorizontalAlignment="Center" VerticalAlignment="Center"
                          IsVisible="{Binding IsLoading}"/>
+
+          <!-- Summary -->
+          <Border Grid.Row="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1,0,1,1" Background="Transparent">
+            <TextBlock Margin="4,0,0,0"
+                       Foreground="{DynamicResource Brush.FG2}"
+                       HorizontalAlignment="Left" VerticalAlignment="Center">
+              <Run Text="{Binding TotalChanges, Mode=OneWay}" FontWeight="Bold"/>
+              <Run Text="{DynamicResource Text.CommitDetail.Changes.Count}"/>
+            </TextBlock>
+          </Border>
         </Grid>
 
         <GridSplitter Grid.Column="1"
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index 87424f0ab..77a215df1 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -65,7 +65,7 @@
         <ColumnDefinition Width="*"/>
       </Grid.ColumnDefinitions>
 
-      <Grid Grid.Column="0" RowDefinitions="26,*">
+      <Grid Grid.Column="0" RowDefinitions="26,*,26">
         <!-- Search & Display Mode -->
         <Grid Grid.Row="0" ColumnDefinitions="*,18">
           <TextBox Grid.Column="0"
@@ -109,6 +109,16 @@
                        Width="48" Height="48"
                        HorizontalAlignment="Center" VerticalAlignment="Center"
                        IsVisible="{Binding IsLoading}"/>
+
+        <!-- Summary -->
+        <Border Grid.Row="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1,0,1,1" Background="Transparent">
+          <TextBlock Margin="4,0,0,0"
+                     Foreground="{DynamicResource Brush.FG2}"
+                     HorizontalAlignment="Left" VerticalAlignment="Center">
+            <Run Text="{Binding TotalChanges, Mode=OneWay}" FontWeight="Bold"/>
+            <Run Text="{DynamicResource Text.CommitDetail.Changes.Count}"/>
+          </TextBlock>
+        </Border>
       </Grid>
 
       <GridSplitter Grid.Column="1"

From 8c772f282db685fceac2d8724fa0db4705701cd9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 23 Dec 2025 10:09:10 +0800
Subject: [PATCH 29/51] enhance: stage/unstage operation

- Do not use `add .` since it may run very slowly
- Rename `UnstageChangesForAmend` command to `UpdateIndexInfo` and force using UTF-8 (without BOM) encoding for inputs
- Remove unused commands

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Add.cs                           | 16 +---------
 src/Commands/Restore.cs                       | 27 +---------------
 ...eChangesForAmend.cs => UpdateIndexInfo.cs} | 10 +++---
 src/ViewModels/Discard.cs                     |  2 +-
 src/ViewModels/WorkingCopy.cs                 | 32 ++++++-------------
 5 files changed, 19 insertions(+), 68 deletions(-)
 rename src/Commands/{UnstageChangesForAmend.cs => UpdateIndexInfo.cs} (88%)

diff --git a/src/Commands/Add.cs b/src/Commands/Add.cs
index 9bd576359..916063d82 100644
--- a/src/Commands/Add.cs
+++ b/src/Commands/Add.cs
@@ -2,25 +2,11 @@
 {
     public class Add : Command
     {
-        public Add(string repo, bool includeUntracked)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-            Args = includeUntracked ? "add ." : "add -u .";
-        }
-
-        public Add(string repo, Models.Change change)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-            Args = $"add -- {change.Path.Quoted()}";
-        }
-
         public Add(string repo, string pathspecFromFile)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"add --pathspec-from-file={pathspecFromFile.Quoted()}";
+            Args = $"add --force --verbose --pathspec-from-file={pathspecFromFile.Quoted()}";
         }
     }
 }
diff --git a/src/Commands/Restore.cs b/src/Commands/Restore.cs
index e2f9aa09a..49b760a4a 100644
--- a/src/Commands/Restore.cs
+++ b/src/Commands/Restore.cs
@@ -4,38 +4,13 @@ namespace SourceGit.Commands
 {
     public class Restore : Command
     {
-        /// <summary>
-        ///     Only used for single staged change.
-        /// </summary>
-        /// <param name="repo"></param>
-        /// <param name="stagedChange"></param>
-        public Restore(string repo, Models.Change stagedChange)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-
-            var builder = new StringBuilder();
-            builder.Append("restore --staged -- ").Append(stagedChange.Path.Quoted());
-
-            if (stagedChange.Index == Models.ChangeState.Renamed)
-                builder.Append(' ').Append(stagedChange.OriginalPath.Quoted());
-
-            Args = builder.ToString();
-        }
-
-        /// <summary>
-        ///     Restore changes given in a path-spec file.
-        /// </summary>
-        /// <param name="repo"></param>
-        /// <param name="pathspecFile"></param>
-        /// <param name="isStaged"></param>
         public Restore(string repo, string pathspecFile, bool isStaged)
         {
             WorkingDirectory = repo;
             Context = repo;
 
             var builder = new StringBuilder();
-            builder.Append("restore ");
+            builder.Append("restore --progress ");
             builder.Append(isStaged ? "--staged " : "--worktree --recurse-submodules ");
             builder.Append("--pathspec-from-file=").Append(pathspecFile.Quoted());
 
diff --git a/src/Commands/UnstageChangesForAmend.cs b/src/Commands/UpdateIndexInfo.cs
similarity index 88%
rename from src/Commands/UnstageChangesForAmend.cs
rename to src/Commands/UpdateIndexInfo.cs
index 9170306a0..3633a2823 100644
--- a/src/Commands/UnstageChangesForAmend.cs
+++ b/src/Commands/UpdateIndexInfo.cs
@@ -6,9 +6,9 @@
 
 namespace SourceGit.Commands
 {
-    public class UnstageChangesForAmend
+    public class UpdateIndexInfo
     {
-        public UnstageChangesForAmend(string repo, List<Models.Change> changes)
+        public UpdateIndexInfo(string repo, List<Models.Change> changes)
         {
             _repo = repo;
 
@@ -18,7 +18,7 @@ public UnstageChangesForAmend(string repo, List<Models.Change> changes)
                 {
                     _patchBuilder.Append("0 0000000000000000000000000000000000000000\t");
                     _patchBuilder.Append(c.Path);
-                    _patchBuilder.Append("\0100644 ");
+                    _patchBuilder.Append("\n100644 ");
                     _patchBuilder.Append(c.DataForAmend.ObjectHash);
                     _patchBuilder.Append("\t");
                     _patchBuilder.Append(c.OriginalPath);
@@ -60,6 +60,8 @@ public async Task<bool> ExecAsync()
             starter.RedirectStandardInput = true;
             starter.RedirectStandardOutput = false;
             starter.RedirectStandardError = true;
+            starter.StandardInputEncoding = new UTF8Encoding(false);
+            starter.StandardErrorEncoding = Encoding.UTF8;
 
             try
             {
@@ -78,7 +80,7 @@ public async Task<bool> ExecAsync()
             }
             catch (Exception e)
             {
-                App.RaiseException(_repo, "Failed to unstage changes: " + e.Message);
+                App.RaiseException(_repo, "Failed to update index: " + e.Message);
                 return false;
             }
         }
diff --git a/src/ViewModels/Discard.cs b/src/ViewModels/Discard.cs
index 78c7b4bd6..2be1752de 100644
--- a/src/ViewModels/Discard.cs
+++ b/src/ViewModels/Discard.cs
@@ -67,7 +67,7 @@ public override async Task<bool> Sure()
             using var lockWatcher = _repo.LockWatcher();
             ProgressDescription = _changes == null ? "Discard all local changes ..." : $"Discard total {_changes.Count} changes ...";
 
-            var log = _repo.CreateLog("Discard all");
+            var log = _repo.CreateLog("Discard Changes");
             Use(log);
 
             if (Mode is DiscardAllMode all)
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 68b5fd11b..578b3fd86 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -348,22 +348,15 @@ public async Task StageChangesAsync(List<Models.Change> changes, Models.Change n
             using var lockWatcher = _repo.LockWatcher();
 
             var log = _repo.CreateLog("Stage");
-            if (count == _unstaged.Count)
+            var pathSpecFile = Path.GetTempFileName();
+            await using (var writer = new StreamWriter(pathSpecFile))
             {
-                await new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Use(log).ExecAsync();
+                foreach (var c in canStaged)
+                    await writer.WriteLineAsync(c.Path);
             }
-            else
-            {
-                var pathSpecFile = Path.GetTempFileName();
-                await using (var writer = new StreamWriter(pathSpecFile))
-                {
-                    foreach (var c in canStaged)
-                        await writer.WriteLineAsync(c.Path);
-                }
 
-                await new Commands.Add(_repo.FullPath, pathSpecFile).Use(log).ExecAsync();
-                File.Delete(pathSpecFile);
-            }
+            await new Commands.Add(_repo.FullPath, pathSpecFile).Use(log).ExecAsync();
+            File.Delete(pathSpecFile);
             log.Complete();
 
             _repo.MarkWorkingCopyDirtyManually();
@@ -385,7 +378,7 @@ public async Task UnstageChangesAsync(List<Models.Change> changes, Models.Change
             if (_useAmend)
             {
                 log.AppendLine("$ git update-index --index-info ");
-                await new Commands.UnstageChangesForAmend(_repo.FullPath, changes).ExecAsync();
+                await new Commands.UpdateIndexInfo(_repo.FullPath, changes).ExecAsync();
             }
             else
             {
@@ -646,16 +639,11 @@ public async Task CommitAsync(bool autoStage, bool autoPush)
             IsCommitting = true;
             _repo.Settings.PushCommitMessage(_commitMessage);
 
-            var log = _repo.CreateLog("Commit");
-            var succ = true;
             if (autoStage && _unstaged.Count > 0)
-                succ = await new Commands.Add(_repo.FullPath, _repo.IncludeUntracked)
-                    .Use(log)
-                    .ExecAsync()
-                    .ConfigureAwait(false);
+                await StageChangesAsync(_unstaged, null);
 
-            if (succ)
-                succ = await new Commands.Commit(_repo.FullPath, _commitMessage, EnableSignOff, NoVerifyOnCommit, _useAmend, _resetAuthor)
+            var log = _repo.CreateLog("Commit");
+            var succ = await new Commands.Commit(_repo.FullPath, _commitMessage, EnableSignOff, NoVerifyOnCommit, _useAmend, _resetAuthor)
                     .Use(log)
                     .RunAsync()
                     .ConfigureAwait(false);

From 6b274ad1b8c51c65adef1691237fc718e400765f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 23 Dec 2025 16:18:12 +0800
Subject: [PATCH 30/51] ux: content background in flyout

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

diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index c48c4a171..f259fd32d 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -215,7 +215,7 @@
           <Border Name="LayoutRoot"
                   Margin="4"
                   Padding="12"
-                  Background="{DynamicResource Brush.Popup}"
+                  Background="Transparent"
                   BorderThickness="0"
                   CornerRadius="{TemplateBinding CornerRadius}">
             <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"

From d9dd2c188d01fffbf4b6aae42f753323c50aae5b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 23 Dec 2025 16:35:08 +0800
Subject: [PATCH 31/51] enhance: do not init submodules after merge/pull (only
 update initialized submodules)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Merge.cs | 2 +-
 src/ViewModels/Pull.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
index 28bc9d8d7..e43608798 100644
--- a/src/ViewModels/Merge.cs
+++ b/src/ViewModels/Merge.cs
@@ -95,7 +95,7 @@ public override async Task<bool> Sure()
                 if (submodules.Count > 0)
                     await new Commands.Submodule(_repo.FullPath)
                         .Use(log)
-                        .UpdateAsync(submodules, true, true);
+                        .UpdateAsync(submodules, false, true);
             }
 
             log.Complete();
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
index 378d63f40..8f2b3c232 100644
--- a/src/ViewModels/Pull.cs
+++ b/src/ViewModels/Pull.cs
@@ -151,7 +151,7 @@ public override async Task<bool> Sure()
                 {
                     var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath).GetResultAsync();
                     if (submodules.Count > 0)
-                        await new Commands.Submodule(_repo.FullPath).Use(log).UpdateAsync(submodules, true, true);
+                        await new Commands.Submodule(_repo.FullPath).Use(log).UpdateAsync(submodules, false, true);
                 }
 
                 if (needPopStash)

From d098f4e49f801f463269339ee571c8e85797d964 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 23 Dec 2025 18:05:16 +0800
Subject: [PATCH 32/51] ux: toolbar buttons in commit message edit box (#2003)

- Change button's `Width` from 24px to 28px
- Disable button while its context menu is opening

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/CommitMessageToolBox.axaml    |  8 ++++----
 src/Views/CommitMessageToolBox.axaml.cs | 12 +++++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Views/CommitMessageToolBox.axaml b/src/Views/CommitMessageToolBox.axaml
index 590de7c9c..1c937ca7b 100644
--- a/src/Views/CommitMessageToolBox.axaml
+++ b/src/Views/CommitMessageToolBox.axaml
@@ -37,7 +37,7 @@
         <Grid ColumnDefinitions="Auto,Auto,Auto,*" Margin="0,4">
           <Button Grid.Column="0"
                   Classes="icon_button"
-                  Width="24"
+                  Width="28"
                   Margin="0,0,4,0" Padding="0"
                   Click="OnOpenCommitMessagePicker"
                   IsVisible="{Binding #ThisControl.ShowAdvancedOptions}"
@@ -47,7 +47,7 @@
 
           <Button Grid.Column="1"
                   Classes="icon_button"
-                  Width="24"
+                  Width="28"
                   Margin="0,0,4,0" Padding="0"
                   Click="OnOpenOpenAIHelper"
                   IsVisible="{Binding #ThisControl.ShowAdvancedOptions}"
@@ -57,8 +57,8 @@
 
           <Button Grid.Column="2"
                   Classes="icon_button"
-                  Width="24"
-                  Margin="0,0,4,0" Padding="0"
+                  Width="28"
+                  Margin="0" Padding="0"
                   Click="OnOpenConventionalCommitHelper"
                   ToolTip.Tip="{DynamicResource Text.ConventionalCommit}">
             <Path Width="13" Height="13" Margin="0,1,0,0" Data="{StaticResource Icons.CommitMessageGenerator}"/>
diff --git a/src/Views/CommitMessageToolBox.axaml.cs b/src/Views/CommitMessageToolBox.axaml.cs
index 01451e942..900bd489f 100644
--- a/src/Views/CommitMessageToolBox.axaml.cs
+++ b/src/Views/CommitMessageToolBox.axaml.cs
@@ -477,7 +477,9 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
                     menu.Items.Add(clearHistoryItem);
                 }
 
+                button.IsEnabled = false;
                 menu.Placement = PlacementMode.TopEdgeAlignedLeft;
+                menu.Closed += (o, ev) => button.IsEnabled = true;
                 menu.Open(button);
             }
 
@@ -486,7 +488,7 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
 
         private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
         {
-            if (DataContext is ViewModels.WorkingCopy vm && sender is Control control && ShowAdvancedOptions)
+            if (DataContext is ViewModels.WorkingCopy vm && sender is Button button && ShowAdvancedOptions)
             {
                 var repo = vm.Repository;
 
@@ -509,7 +511,7 @@ private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
                     return;
                 }
 
-                var menu = new ContextMenu() { Placement = PlacementMode.TopEdgeAlignedLeft };
+                var menu = new ContextMenu();
                 foreach (var service in services)
                 {
                     var dup = service;
@@ -523,7 +525,11 @@ private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
 
                     menu.Items.Add(item);
                 }
-                menu.Open(control);
+
+                button.IsEnabled = false;
+                menu.Placement = PlacementMode.TopEdgeAlignedLeft;
+                menu.Closed += (o, ev) => button.IsEnabled = true;
+                menu.Open(button);
             }
 
             e.Handled = true;

From 4a830bae6f05b254fc40dd795e0af252f33b0165 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 23 Dec 2025 18:19:19 +0800
Subject: [PATCH 33/51] ux: set icon foreground manually since the button is
 disabled

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

diff --git a/src/Views/CommitMessageToolBox.axaml.cs b/src/Views/CommitMessageToolBox.axaml.cs
index 900bd489f..22beffd7b 100644
--- a/src/Views/CommitMessageToolBox.axaml.cs
+++ b/src/Views/CommitMessageToolBox.axaml.cs
@@ -370,6 +370,8 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
             if (sender is Button button && DataContext is ViewModels.WorkingCopy vm && ShowAdvancedOptions)
             {
                 var repo = vm.Repository;
+                var foreground = this.FindResource("Brush.FG1") as IBrush;
+
                 var menu = new ContextMenu();
                 menu.MaxWidth = 480;
 
@@ -388,10 +390,13 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
                 {
                     for (int i = 0; i < templateCount; i++)
                     {
+                        var icon = App.CreateMenuIcon("Icons.Code");
+                        icon.Fill = foreground;
+
                         var template = repo.Settings.CommitTemplates[i];
                         var item = new MenuItem();
                         item.Header = App.Text("WorkingCopy.UseCommitTemplate", template.Name);
-                        item.Icon = App.CreateMenuIcon("Icons.Code");
+                        item.Icon = icon;
                         item.Click += (_, ev) =>
                         {
                             vm.ApplyCommitMessageTemplate(template);
@@ -414,9 +419,12 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
                                 friendlyName = $"~{gitTemplate.AsSpan(prefixLen)}";
                         }
 
+                        var icon = App.CreateMenuIcon("Icons.Code");
+                        icon.Fill = foreground;
+
                         var gitTemplateItem = new MenuItem();
                         gitTemplateItem.Header = App.Text("WorkingCopy.UseCommitTemplate", friendlyName);
-                        gitTemplateItem.Icon = App.CreateMenuIcon("Icons.Code");
+                        gitTemplateItem.Icon = icon;
                         gitTemplateItem.Click += (_, ev) =>
                         {
                             if (File.Exists(gitTemplate))
@@ -451,9 +459,12 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
                             TextTrimming = TextTrimming.CharacterEllipsis
                         };
 
+                        var icon = App.CreateMenuIcon("Icons.Histories");
+                        icon.Fill = foreground;
+
                         var item = new MenuItem();
                         item.Header = header;
-                        item.Icon = App.CreateMenuIcon("Icons.Histories");
+                        item.Icon = icon;
                         item.Click += (_, ev) =>
                         {
                             vm.CommitMessage = dup;
@@ -465,9 +476,12 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
 
                     menu.Items.Add(new MenuItem() { Header = "-" });
 
+                    var clearIcon = App.CreateMenuIcon("Icons.Clear");
+                    clearIcon.Fill = foreground;
+
                     var clearHistoryItem = new MenuItem();
                     clearHistoryItem.Header = App.Text("WorkingCopy.ClearCommitHistories");
-                    clearHistoryItem.Icon = App.CreateMenuIcon("Icons.Clear");
+                    clearHistoryItem.Icon = clearIcon;
                     clearHistoryItem.Click += async (_, ev) =>
                     {
                         await vm.ClearCommitMessageHistoryAsync();

From a570951b7f2662da812d344e7f1f23bade1ac856 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 23 Dec 2025 18:40:34 +0800
Subject: [PATCH 34/51] code_style: remove unused code

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Native/OS.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Native/OS.cs b/src/Native/OS.cs
index 4da62b5ff..1fd4b34d9 100644
--- a/src/Native/OS.cs
+++ b/src/Native/OS.cs
@@ -198,7 +198,6 @@ public static Models.DiffMergeTool GetDiffMergeTool(bool onlyDiff)
             if (ExternalMergerType != 0 && (string.IsNullOrEmpty(ExternalMergerExecFile) || !File.Exists(ExternalMergerExecFile)))
                 return null;
 
-            var tool = Models.ExternalMerger.Supported[ExternalMergerType];
             return new Models.DiffMergeTool(ExternalMergerExecFile, onlyDiff ? ExternalDiffArgs : ExternalMergeArgs);
         }
 

From 83be4bd96a54728c1f20b55d1570f43b2674bb93 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 24 Dec 2025 15:28:09 +0800
Subject: [PATCH 35/51] enhance: refresh submodules manually after
 update/de-init submodule

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/Watcher.cs              | 5 +++++
 src/ViewModels/DeinitSubmodule.cs  | 1 +
 src/ViewModels/Repository.cs       | 6 ++++++
 src/ViewModels/UpdateSubmodules.cs | 1 +
 4 files changed, 13 insertions(+)

diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index e7684e2c9..03b4ca5f2 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -118,6 +118,11 @@ public void MarkStashUpdated()
             Interlocked.Exchange(ref _updateStashes, 0);
         }
 
+        public void MarkSubmodulesUpdated()
+        {
+            Interlocked.Exchange(ref _updateSubmodules, 0);
+        }
+
         public void Dispose()
         {
             foreach (var watcher in _watchers)
diff --git a/src/ViewModels/DeinitSubmodule.cs b/src/ViewModels/DeinitSubmodule.cs
index d224ce03e..f9fff198d 100644
--- a/src/ViewModels/DeinitSubmodule.cs
+++ b/src/ViewModels/DeinitSubmodule.cs
@@ -36,6 +36,7 @@ public override async Task<bool> Sure()
                 .DeinitAsync(Submodule, false);
 
             log.Complete();
+            _repo.MarkSubmodulesDirtyManually();
             return succ;
         }
 
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 1aaa6bd9e..5ab2d1c27 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -877,6 +877,12 @@ public void MarkStashesDirtyManually()
             RefreshStashes();
         }
 
+        public void MarkSubmodulesDirtyManually()
+        {
+            _watcher?.MarkSubmodulesUpdated();
+            RefreshSubmodules();
+        }
+
         public void MarkFetched()
         {
             _lastFetchTime = DateTime.Now;
diff --git a/src/ViewModels/UpdateSubmodules.cs b/src/ViewModels/UpdateSubmodules.cs
index e66a85dd1..53aa8c17f 100644
--- a/src/ViewModels/UpdateSubmodules.cs
+++ b/src/ViewModels/UpdateSubmodules.cs
@@ -96,6 +96,7 @@ public override async Task<bool> Sure()
                 .UpdateAsync(targets, EnableInit, EnableRecursive, EnableRemote);
 
             log.Complete();
+            _repo.MarkSubmodulesDirtyManually();
             return true;
         }
 

From 79feb442ee61d7fa93fbbad6d69512af6a3e2d1e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 24 Dec 2025 16:15:48 +0800
Subject: [PATCH 36/51] refactor: auto update submodules (only initialized)
 after `checkout/create branch/merge/pull`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryUpdatableSubmodules.cs | 14 ++++++++++----
 src/Models/RepositorySettings.cs         |  6 ------
 src/Resources/Locales/de_DE.axaml        |  2 --
 src/Resources/Locales/en_US.axaml        |  2 --
 src/Resources/Locales/es_ES.axaml        |  2 --
 src/Resources/Locales/fr_FR.axaml        |  2 --
 src/Resources/Locales/id_ID.axaml        |  2 --
 src/Resources/Locales/it_IT.axaml        |  2 --
 src/Resources/Locales/ko_KR.axaml        |  2 --
 src/Resources/Locales/ru_RU.axaml        |  2 --
 src/Resources/Locales/zh_CN.axaml        |  2 --
 src/Resources/Locales/zh_TW.axaml        |  2 --
 src/ViewModels/Checkout.cs               | 24 +++++-------------------
 src/ViewModels/CheckoutAndFastForward.cs | 24 +++++-------------------
 src/ViewModels/CheckoutCommit.cs         | 24 +++++-------------------
 src/ViewModels/Clone.cs                  |  2 +-
 src/ViewModels/CreateBranch.cs           | 24 +++++-------------------
 src/ViewModels/Merge.cs                  |  2 +-
 src/ViewModels/Pull.cs                   | 21 +++------------------
 src/Views/Checkout.axaml                 |  8 --------
 src/Views/CheckoutAndFastForward.axaml   |  8 --------
 src/Views/CheckoutCommit.axaml           | 10 +---------
 src/Views/CreateBranch.axaml             | 15 +--------------
 src/Views/Pull.axaml                     |  8 --------
 24 files changed, 37 insertions(+), 173 deletions(-)

diff --git a/src/Commands/QueryUpdatableSubmodules.cs b/src/Commands/QueryUpdatableSubmodules.cs
index 05fcc0538..55f429905 100644
--- a/src/Commands/QueryUpdatableSubmodules.cs
+++ b/src/Commands/QueryUpdatableSubmodules.cs
@@ -7,14 +7,16 @@ namespace SourceGit.Commands
 {
     public partial class QueryUpdatableSubmodules : Command
     {
-        [GeneratedRegex(@"^([U\-\+ ])([0-9a-f]+)\s(.*?)(\s\(.*\))?$")]
+        [GeneratedRegex(@"^([\-\+])([0-9a-f]+)\s(.*?)(\s\(.*\))?$")]
         private static partial Regex REG_FORMAT_STATUS();
 
-        public QueryUpdatableSubmodules(string repo)
+        public QueryUpdatableSubmodules(string repo, bool includeUninited)
         {
             WorkingDirectory = repo;
             Context = repo;
             Args = "submodule status";
+
+            _includeUninited = includeUninited;
         }
 
         public async Task<List<string>> GetResultAsync()
@@ -30,12 +32,16 @@ public async Task<List<string>> GetResultAsync()
                 {
                     var stat = match.Groups[1].Value;
                     var path = match.Groups[3].Value;
-                    if (!stat.StartsWith(' '))
-                        submodules.Add(path);
+                    if (!_includeUninited && stat.StartsWith('-'))
+                        continue;
+
+                    submodules.Add(path);
                 }
             }
 
             return submodules;
         }
+
+        private bool _includeUninited = false;
     }
 }
diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index b0d52d50a..ddee7fe03 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -107,12 +107,6 @@ public bool CheckoutBranchOnCreateBranch
             set;
         } = true;
 
-        public bool UpdateSubmodulesOnCheckoutBranch
-        {
-            get;
-            set;
-        } = true;
-
         public AvaloniaList<CommitTemplate> CommitTemplates
         {
             get;
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 530dcd505..7d2e27c08 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -109,7 +109,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
-  <x:String x:Key="Text.Checkout.RecurseSubmodules" xml:space="preserve">Alle Submodule updaten</x:String>
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">Dein aktueller HEAD enthält Commit(s) ohne Verbindung zu einem Branch/Tag. Möchtest du trotzdem fortfahren?</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">Auschecken &amp; Fast-Forward</x:String>
@@ -645,7 +644,6 @@
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
-  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">Alle Submodule aktualisieren</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
   <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Rebase anstatt Merge verwenden</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index daa23e13d..d60e868e3 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -105,7 +105,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Local Changes:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Reapply</x:String>
-  <x:String x:Key="Text.Checkout.RecurseSubmodules" xml:space="preserve">Update all submodules</x:String>
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">Your current HEAD contains commit(s) not connected to any branches/tags! Do you want to continue?</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">Checkout &amp; Fast-Forward</x:String>
@@ -648,7 +647,6 @@
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Local Changes:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Reapply</x:String>
-  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">Update all submodules</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
   <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Use rebase instead of merge</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index acccc2f67..f15b4b87d 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -109,7 +109,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
-  <x:String x:Key="Text.Checkout.RecurseSubmodules" xml:space="preserve">Actualizar todos los submódulos</x:String>
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Rama:</x:String>
   <x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">¡Tu HEAD actual contiene commit(s) que no están conectados a ningunas ramas/etiquetas! ¿Quieres continuar?</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">Checkout &amp; Fast-Forward</x:String>
@@ -643,7 +642,6 @@
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
-  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">Actualizar todos los submódulos</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
   <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Usar rebase en lugar de merge</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 2178b207e..5f0c6f109 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -108,7 +108,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Annuler</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Mettre en stash et réappliquer</x:String>
-  <x:String x:Key="Text.Checkout.RecurseSubmodules" xml:space="preserve">Mettre à jour tous les sous-modules</x:String>
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branche :</x:String>
   <x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">Votre HEAD actuel contient un ou plusieurs commits non connectés à une branche/tag ! Voulez-vous continuer ?</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">Récupérer &amp; Fast-Forward</x:String>
@@ -637,7 +636,6 @@
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Rejeter</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Réappliquer</x:String>
-  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">Mettre à jour tous les sous-modules</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Dépôt distant :</x:String>
   <x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
   <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Utiliser rebase au lieu de merge</x:String>
diff --git a/src/Resources/Locales/id_ID.axaml b/src/Resources/Locales/id_ID.axaml
index bc6e8e95b..77eb5cc57 100644
--- a/src/Resources/Locales/id_ID.axaml
+++ b/src/Resources/Locales/id_ID.axaml
@@ -104,7 +104,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Perubahan Lokal:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Buang</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Terapkan Ulang</x:String>
-  <x:String x:Key="Text.Checkout.RecurseSubmodules" xml:space="preserve">Perbarui semua submodule</x:String>
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">HEAD saat ini mengandung commit yang tidak terhubung ke branch/tag manapun! Lanjutkan?</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">Checkout &amp; Fast-Forward</x:String>
@@ -612,7 +611,6 @@
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Perubahan Lokal:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Buang</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Terapkan Ulang</x:String>
-  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">Perbarui semua submodule</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
   <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Gunakan rebase alih-alih merge</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index df5e6e912..c56954628 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -98,7 +98,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Stasha e Ripristina</x:String>
-  <x:String x:Key="Text.Checkout.RecurseSubmodules" xml:space="preserve">Aggiorna tutti i sottomoduli</x:String>
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">Il tuo HEAD attuale contiene commit non connessi ad alcun branch/tag! Sicuro di voler continuare?</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">Checkout &amp; Avanzamento Veloce</x:String>
@@ -593,7 +592,6 @@
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stasha e Riapplica</x:String>
-  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">Aggiorna tutti i sottomoduli</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.Pull.Title" xml:space="preserve">Scarica (Recupera e Unisci)</x:String>
   <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Riallineare anziché unire</x:String>
diff --git a/src/Resources/Locales/ko_KR.axaml b/src/Resources/Locales/ko_KR.axaml
index 67d3d5ca1..5cc2a06a1 100644
--- a/src/Resources/Locales/ko_KR.axaml
+++ b/src/Resources/Locales/ko_KR.axaml
@@ -101,7 +101,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">로컬 변경 사항:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">폐기</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">스태시 &amp; 재적용</x:String>
-  <x:String x:Key="Text.Checkout.RecurseSubmodules" 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.WithFastForward" xml:space="preserve">체크아웃 &amp; Fast-Forward</x:String>
@@ -613,7 +612,6 @@
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">로컬 변경 사항:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">폐기</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">스태시 &amp; 재적용</x:String>
-  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">모든 서브모듈 업데이트</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">원격:</x:String>
   <x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; 병합)</x:String>
   <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">병합 대신 리베이스 사용</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 35d283226..ea658ef9e 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -109,7 +109,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Локальные изменения:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Отклонить</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Отложить и применить повторно</x:String>
-  <x:String x:Key="Text.Checkout.RecurseSubmodules" 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">Ваша текущая ГОЛОВА содержит ревизию(и), не связанные ни с к какими ветками или метками! Вы хотите продолжить?</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">Переключиться и перемотать</x:String>
@@ -652,7 +651,6 @@
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Локальные изменения:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Отклонить</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Отложить и применить повторно</x:String>
-  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">Обновить все подмодули</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Внешний репозиторий:</x:String>
   <x:String x:Key="Text.Pull.Title" xml:space="preserve">Загрузить (Получить и слить)</x:String>
   <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Использовать перемещение вместо слияния</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index b9a5fb63f..bab627b7f 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -109,7 +109,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">未提交更改 ：</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">丢弃更改</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">贮藏并自动恢复</x:String>
-  <x:String x:Key="Text.Checkout.RecurseSubmodules" 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.WithFastForward" xml:space="preserve">检出分支并快进</x:String>
@@ -652,7 +651,6 @@
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">未提交更改 ：</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">丢弃更改</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">贮藏并自动恢复</x:String>
-  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">同时更新所有子模块</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">远程 ：</x:String>
   <x:String x:Key="Text.Pull.Title" xml:space="preserve">拉回（拉取并合并）</x:String>
   <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">使用变基方式合并分支</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 9178f6fef..a2a4443c8 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -109,7 +109,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">未提交變更:</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">捨棄變更</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">擱置變更並自動復原</x:String>
-  <x:String x:Key="Text.Checkout.RecurseSubmodules" 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.WithFastForward" xml:space="preserve">簽出分支並快轉</x:String>
@@ -652,7 +651,6 @@
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">未提交變更:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">捨棄變更</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">擱置變更並自動復原</x:String>
-  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">同時更新所有子模組</x:String>
   <x:String x:Key="Text.Pull.Remote" xml:space="preserve">遠端:</x:String>
   <x:String x:Key="Text.Pull.Title" xml:space="preserve">拉取 (提取並合併)</x:String>
   <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">使用重定基底 (rebase) 合併分支</x:String>
diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs
index ec67dca31..9980f84d2 100644
--- a/src/ViewModels/Checkout.cs
+++ b/src/ViewModels/Checkout.cs
@@ -15,17 +15,6 @@ public bool DiscardLocalChanges
             set;
         }
 
-        public bool IsRecurseSubmoduleVisible
-        {
-            get => _repo.Submodules.Count > 0;
-        }
-
-        public bool RecurseSubmodules
-        {
-            get => _repo.Settings.UpdateSubmodulesOnCheckoutBranch;
-            set => _repo.Settings.UpdateSubmodulesOnCheckoutBranch = value;
-        }
-
         public Checkout(Repository repo, string branch)
         {
             _repo = repo;
@@ -80,14 +69,11 @@ public override async Task<bool> Sure()
 
             if (succ)
             {
-                if (IsRecurseSubmoduleVisible && RecurseSubmodules)
-                {
-                    var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath).GetResultAsync();
-                    if (submodules.Count > 0)
-                        await new Commands.Submodule(_repo.FullPath)
-                            .Use(log)
-                            .UpdateAsync(submodules, true, true);
-                }
+                var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath, false).GetResultAsync();
+                if (submodules.Count > 0)
+                    await new Commands.Submodule(_repo.FullPath)
+                        .Use(log)
+                        .UpdateAsync(submodules, false, true);
 
                 if (needPopStash)
                     await new Commands.Stash(_repo.FullPath)
diff --git a/src/ViewModels/CheckoutAndFastForward.cs b/src/ViewModels/CheckoutAndFastForward.cs
index 63b93a9df..44a477c8c 100644
--- a/src/ViewModels/CheckoutAndFastForward.cs
+++ b/src/ViewModels/CheckoutAndFastForward.cs
@@ -20,17 +20,6 @@ public bool DiscardLocalChanges
             set;
         }
 
-        public bool IsRecurseSubmoduleVisible
-        {
-            get => _repo.Submodules.Count > 0;
-        }
-
-        public bool RecurseSubmodules
-        {
-            get => _repo.Settings.UpdateSubmodulesOnCheckoutBranch;
-            set => _repo.Settings.UpdateSubmodulesOnCheckoutBranch = value;
-        }
-
         public CheckoutAndFastForward(Repository repo, Models.Branch localBranch, Models.Branch remoteBranch)
         {
             _repo = repo;
@@ -85,14 +74,11 @@ public override async Task<bool> Sure()
 
             if (succ)
             {
-                if (IsRecurseSubmoduleVisible && RecurseSubmodules)
-                {
-                    var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath).GetResultAsync();
-                    if (submodules.Count > 0)
-                        await new Commands.Submodule(_repo.FullPath)
-                            .Use(log)
-                            .UpdateAsync(submodules, true, true);
-                }
+                var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath, false).GetResultAsync();
+                if (submodules.Count > 0)
+                    await new Commands.Submodule(_repo.FullPath)
+                        .Use(log)
+                        .UpdateAsync(submodules, false, true);
 
                 if (needPopStash)
                     await new Commands.Stash(_repo.FullPath)
diff --git a/src/ViewModels/CheckoutCommit.cs b/src/ViewModels/CheckoutCommit.cs
index b4d4438c7..55da0862b 100644
--- a/src/ViewModels/CheckoutCommit.cs
+++ b/src/ViewModels/CheckoutCommit.cs
@@ -15,17 +15,6 @@ public bool DiscardLocalChanges
             set;
         }
 
-        public bool IsRecurseSubmoduleVisible
-        {
-            get => _repo.Submodules.Count > 0;
-        }
-
-        public bool RecurseSubmodules
-        {
-            get => _repo.Settings.UpdateSubmodulesOnCheckoutBranch;
-            set => _repo.Settings.UpdateSubmodulesOnCheckoutBranch = value;
-        }
-
         public CheckoutCommit(Repository repo, Models.Commit commit)
         {
             _repo = repo;
@@ -80,14 +69,11 @@ public override async Task<bool> Sure()
 
             if (succ)
             {
-                if (IsRecurseSubmoduleVisible && RecurseSubmodules)
-                {
-                    var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath).GetResultAsync();
-                    if (submodules.Count > 0)
-                        await new Commands.Submodule(_repo.FullPath)
-                            .Use(log)
-                            .UpdateAsync(submodules, true, true);
-                }
+                var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath, false).GetResultAsync();
+                if (submodules.Count > 0)
+                    await new Commands.Submodule(_repo.FullPath)
+                        .Use(log)
+                        .UpdateAsync(submodules, false, true);
 
                 if (needPop)
                     await new Commands.Stash(_repo.FullPath)
diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs
index 73033682e..014063bdb 100644
--- a/src/ViewModels/Clone.cs
+++ b/src/ViewModels/Clone.cs
@@ -140,7 +140,7 @@ public override async Task<bool> Sure()
 
             if (InitAndUpdateSubmodules)
             {
-                var submodules = await new Commands.QueryUpdatableSubmodules(path).GetResultAsync();
+                var submodules = await new Commands.QueryUpdatableSubmodules(path, true).GetResultAsync();
                 if (submodules.Count > 0)
                     await new Commands.Submodule(path)
                         .Use(log)
diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
index 2fbb4a105..593c9fbdf 100644
--- a/src/ViewModels/CreateBranch.cs
+++ b/src/ViewModels/CreateBranch.cs
@@ -54,17 +54,6 @@ public bool AllowOverwrite
             }
         }
 
-        public bool IsRecurseSubmoduleVisible
-        {
-            get => _repo.Submodules.Count > 0;
-        }
-
-        public bool RecurseSubmodules
-        {
-            get => _repo.Settings.UpdateSubmodulesOnCheckoutBranch;
-            set => _repo.Settings.UpdateSubmodulesOnCheckoutBranch = value;
-        }
-
         public CreateBranch(Repository repo, Models.Branch branch)
         {
             _repo = repo;
@@ -164,14 +153,11 @@ public override async Task<bool> Sure()
 
                 if (succ)
                 {
-                    if (IsRecurseSubmoduleVisible && RecurseSubmodules)
-                    {
-                        var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath).GetResultAsync();
-                        if (submodules.Count > 0)
-                            await new Commands.Submodule(_repo.FullPath)
-                                .Use(log)
-                                .UpdateAsync(submodules, true, true);
-                    }
+                    var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath, false).GetResultAsync();
+                    if (submodules.Count > 0)
+                        await new Commands.Submodule(_repo.FullPath)
+                            .Use(log)
+                            .UpdateAsync(submodules, false, true);
 
                     if (needPopStash)
                         await new Commands.Stash(_repo.FullPath)
diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
index e43608798..8da86daed 100644
--- a/src/ViewModels/Merge.cs
+++ b/src/ViewModels/Merge.cs
@@ -91,7 +91,7 @@ public override async Task<bool> Sure()
                     _repo.SetCommitMessage(msg);
                 }
 
-                var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath).GetResultAsync();
+                var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath, false).GetResultAsync();
                 if (submodules.Count > 0)
                     await new Commands.Submodule(_repo.FullPath)
                         .Use(log)
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
index 8f2b3c232..81a8ba096 100644
--- a/src/ViewModels/Pull.cs
+++ b/src/ViewModels/Pull.cs
@@ -50,17 +50,6 @@ public bool UseRebase
             set => _repo.Settings.PreferRebaseInsteadOfMerge = value;
         }
 
-        public bool IsRecurseSubmoduleVisible
-        {
-            get => _repo.Submodules.Count > 0;
-        }
-
-        public bool RecurseSubmodules
-        {
-            get => _repo.Settings.UpdateSubmodulesOnCheckoutBranch;
-            set => _repo.Settings.UpdateSubmodulesOnCheckoutBranch = value;
-        }
-
         public Pull(Repository repo, Models.Branch specifiedRemoteBranch)
         {
             _repo = repo;
@@ -118,7 +107,6 @@ public override async Task<bool> Sure()
             var log = _repo.CreateLog("Pull");
             Use(log);
 
-            var updateSubmodules = IsRecurseSubmoduleVisible && RecurseSubmodules;
             var changes = await new Commands.CountLocalChanges(_repo.FullPath, false).GetResultAsync();
             var needPopStash = false;
             if (changes > 0)
@@ -147,12 +135,9 @@ public override async Task<bool> Sure()
                 UseRebase).Use(log).RunAsync();
             if (rs)
             {
-                if (updateSubmodules)
-                {
-                    var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath).GetResultAsync();
-                    if (submodules.Count > 0)
-                        await new Commands.Submodule(_repo.FullPath).Use(log).UpdateAsync(submodules, false, true);
-                }
+                var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath, false).GetResultAsync();
+                if (submodules.Count > 0)
+                    await new Commands.Submodule(_repo.FullPath).Use(log).UpdateAsync(submodules, false, true);
 
                 if (needPopStash)
                     await new Commands.Stash(_repo.FullPath).Use(log).PopAsync("stash@{0}");
diff --git a/src/Views/Checkout.axaml b/src/Views/Checkout.axaml
index 0c8fca5bc..0d2f2ecae 100644
--- a/src/Views/Checkout.axaml
+++ b/src/Views/Checkout.axaml
@@ -22,7 +22,6 @@
       <Grid.RowDefinitions>
         <RowDefinition Height="32"/>
         <RowDefinition Height="Auto" MinHeight="32"/>
-        <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
       <TextBlock Grid.Row="0" Grid.Column="0"
@@ -46,13 +45,6 @@
         <RadioButton GroupName="LocalChanges"
                      Content="{DynamicResource Text.Checkout.LocalChanges.Discard}"/>
       </WrapPanel>
-
-      <CheckBox Grid.Row="2" Grid.Column="1"
-                Height="32"
-                Content="{DynamicResource Text.Checkout.RecurseSubmodules}"
-                IsChecked="{Binding RecurseSubmodules, Mode=TwoWay}"
-                IsVisible="{Binding IsRecurseSubmoduleVisible}"
-                ToolTip.Tip="--recurse-submodules"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/CheckoutAndFastForward.axaml b/src/Views/CheckoutAndFastForward.axaml
index 04edff135..13c12d337 100644
--- a/src/Views/CheckoutAndFastForward.axaml
+++ b/src/Views/CheckoutAndFastForward.axaml
@@ -23,7 +23,6 @@
         <RowDefinition Height="32"/>
         <RowDefinition Height="32"/>
         <RowDefinition Height="Auto" MinHeight="32"/>
-        <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
       <TextBlock Grid.Row="0" Grid.Column="0"
@@ -68,13 +67,6 @@
         <RadioButton GroupName="LocalChanges"
                      Content="{DynamicResource Text.Checkout.LocalChanges.Discard}"/>
       </WrapPanel>
-
-      <CheckBox Grid.Row="3" Grid.Column="1"
-                Height="32"
-                Content="{DynamicResource Text.Checkout.RecurseSubmodules}"
-                IsChecked="{Binding RecurseSubmodules, Mode=TwoWay}"
-                IsVisible="{Binding IsRecurseSubmoduleVisible}"
-                ToolTip.Tip="--recurse-submodules"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/CheckoutCommit.axaml b/src/Views/CheckoutCommit.axaml
index 9d11b00ea..3315a8610 100644
--- a/src/Views/CheckoutCommit.axaml
+++ b/src/Views/CheckoutCommit.axaml
@@ -23,7 +23,6 @@
         <RowDefinition Height="32"/>
         <RowDefinition Height="Auto" MinHeight="32"/>
         <RowDefinition Height="Auto"/>
-        <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
       
       <TextBlock Grid.Row="0" Grid.Column="0"
@@ -49,14 +48,7 @@
                      GroupName="LocalChanges"/>
       </WrapPanel>
 
-      <CheckBox Grid.Row="2" Grid.Column="1"
-                Height="32"
-                Content="{DynamicResource Text.Checkout.RecurseSubmodules}"
-                IsChecked="{Binding RecurseSubmodules, Mode=TwoWay}"
-                IsVisible="{Binding IsRecurseSubmoduleVisible}"
-                ToolTip.Tip="--recurse-submodules"/>
-
-      <Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="Auto,*" Margin="0,6,0,0">
+      <Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="Auto,*" Margin="0,6,0,0">
         <Path Grid.Column="0"
               Width="14" Height="14"
               Data="{StaticResource Icons.Error}"
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index b53a23a2c..eb3dbb43a 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -20,7 +20,7 @@
                  Text="{DynamicResource Text.CreateBranch.Title}"/>
     </StackPanel>
     
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,Auto,Auto">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,Auto">
       <Grid.ColumnDefinitions>
         <ColumnDefinition Width="Auto" MinWidth="140"/>
         <ColumnDefinition Width="*"/>
@@ -93,19 +93,6 @@
                 Content="{DynamicResource Text.CreateBranch.Checkout}"
                 IsChecked="{Binding CheckoutAfterCreated, Mode=TwoWay}"
                 IsVisible="{Binding !IsBareRepository}"/>
-
-      <CheckBox Grid.Row="5" Grid.Column="1"
-                Content="{DynamicResource Text.Checkout.RecurseSubmodules}"
-                IsChecked="{Binding RecurseSubmodules, Mode=TwoWay}"
-                ToolTip.Tip="--recurse-submodules">
-        <CheckBox.IsVisible>
-          <MultiBinding Converter="{x:Static BoolConverters.And}">
-            <Binding Path="IsBareRepository" Converter="{x:Static BoolConverters.Not}"/>
-            <Binding Path="CheckoutAfterCreated"/>
-            <Binding Path="IsRecurseSubmoduleVisible"/>
-          </MultiBinding>
-        </CheckBox.IsVisible>
-      </CheckBox>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Pull.axaml b/src/Views/Pull.axaml
index e882132e9..b09f280f4 100644
--- a/src/Views/Pull.axaml
+++ b/src/Views/Pull.axaml
@@ -25,7 +25,6 @@
         <RowDefinition Height="32"/>
         <RowDefinition Height="Auto" MinHeight="32"/>
         <RowDefinition Height="32"/>
-        <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
       <TextBlock Grid.Row="0" Grid.Column="0"
@@ -96,13 +95,6 @@
                 Content="{DynamicResource Text.Pull.UseRebase}"
                 IsChecked="{Binding UseRebase, Mode=TwoWay}"
                 ToolTip.Tip="--rebase"/>
-
-      <CheckBox Grid.Row="5" Grid.Column="1"
-                Height="32"
-                Content="{DynamicResource Text.Pull.RecurseSubmodules}"
-                IsChecked="{Binding RecurseSubmodules, Mode=TwoWay}"
-                IsVisible="{Binding IsRecurseSubmoduleVisible}"
-                ToolTip.Tip="--recurse-submodules"/>
     </Grid>
   </StackPanel>
 </UserControl>

From 742e76d26a814b4caf4c75b7ba32b448449e5a52 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 08:16:11 +0000
Subject: [PATCH 37/51] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 990444b9f..17e17fce7 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -71,7 +71,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-95.87%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-95.86%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
@@ -117,7 +117,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-93.25%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-93.24%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -187,7 +187,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-74.86%25-red)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-75.03%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -226,7 +226,6 @@ This document shows the translation status of each locale file in the repository
 - Text.ChangeSubmoduleUrl
 - Text.ChangeSubmoduleUrl.Submodule
 - Text.ChangeSubmoduleUrl.URL
-- Text.Checkout.RecurseSubmodules
 - Text.Checkout.WarnLostCommits
 - Text.Checkout.WithFastForward
 - Text.Checkout.WithFastForward.Upstream
@@ -345,7 +344,6 @@ This document shows the translation status of each locale file in the repository
 - Text.Preferences.Git.UseLibsecret
 - Text.Preferences.Shell.Args
 - Text.Preferences.Shell.Args.Tip
-- Text.Pull.RecurseSubmodules
 - Text.Push.New
 - Text.Push.Revision
 - Text.Push.Revision.Title
@@ -426,7 +424,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ko__KR](https://img.shields.io/badge/ko__KR-96.19%25-yellow)
+### ![ko__KR](https://img.shields.io/badge/ko__KR-96.18%25-yellow)
 
 <details>
 <summary>Missing keys in ko_KR.axaml</summary>
@@ -469,7 +467,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-68.66%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-68.81%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -515,7 +513,6 @@ This document shows the translation status of each locale file in the repository
 - Text.ChangeSubmoduleUrl
 - Text.ChangeSubmoduleUrl.Submodule
 - Text.ChangeSubmoduleUrl.URL
-- Text.Checkout.RecurseSubmodules
 - Text.Checkout.WarnLostCommits
 - Text.Checkout.WithFastForward
 - Text.Checkout.WithFastForward.Upstream
@@ -667,7 +664,6 @@ This document shows the translation status of each locale file in the repository
 - Text.Preferences.Git.UseLibsecret
 - Text.Preferences.Shell.Args
 - Text.Preferences.Shell.Args.Tip
-- Text.Pull.RecurseSubmodules
 - Text.Push.New
 - Text.Push.Revision
 - Text.Push.Revision.Title
@@ -767,7 +763,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-74.97%25-red)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-75.14%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -806,7 +802,6 @@ This document shows the translation status of each locale file in the repository
 - Text.ChangeSubmoduleUrl
 - Text.ChangeSubmoduleUrl.Submodule
 - Text.ChangeSubmoduleUrl.URL
-- Text.Checkout.RecurseSubmodules
 - Text.Checkout.WarnLostCommits
 - Text.Checkout.WithFastForward
 - Text.Checkout.WithFastForward.Upstream
@@ -925,7 +920,6 @@ This document shows the translation status of each locale file in the repository
 - Text.Preferences.Git.UseLibsecret
 - Text.Preferences.Shell.Args
 - Text.Preferences.Shell.Args.Tip
-- Text.Pull.RecurseSubmodules
 - Text.Push.New
 - Text.Push.Revision
 - Text.Push.Revision.Title
@@ -1005,7 +999,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-76.06%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-76.23%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1043,7 +1037,6 @@ This document shows the translation status of each locale file in the repository
 - Text.ChangeSubmoduleUrl
 - Text.ChangeSubmoduleUrl.Submodule
 - Text.ChangeSubmoduleUrl.URL
-- Text.Checkout.RecurseSubmodules
 - Text.Checkout.WarnLostCommits
 - Text.Checkout.WithFastForward
 - Text.Checkout.WithFastForward.Upstream
@@ -1158,7 +1151,6 @@ This document shows the translation status of each locale file in the repository
 - Text.Preferences.Git.UseLibsecret
 - Text.Preferences.Shell.Args
 - Text.Preferences.Shell.Args.Tip
-- Text.Pull.RecurseSubmodules
 - Text.Push.New
 - Text.Push.Revision
 - Text.Push.Revision.Title

From 5b8258c64efc6161c83c8a0090409cc8f2684330 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 24 Dec 2025 19:02:21 +0800
Subject: [PATCH 38/51] code_style: tab renderer

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/LauncherTabBar.axaml.cs | 49 ++++++++++---------------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/src/Views/LauncherTabBar.axaml.cs b/src/Views/LauncherTabBar.axaml.cs
index 8d044afc0..1f40aa98d 100644
--- a/src/Views/LauncherTabBar.axaml.cs
+++ b/src/Views/LauncherTabBar.axaml.cs
@@ -113,54 +113,37 @@ public override void Render(DrawingContext context)
 
             var geo = new StreamGeometry();
             const double angle = Math.PI / 2;
-            var y = height + 0.5;
+            var bottom = height + 0.5;
+            var cornerSize = new Size(5, 5);
+
             using (var ctx = geo.Open())
             {
-                double x;
-
                 var drawLeftX = activeStartX - startX + LauncherTabsScroller.Bounds.X;
-                var drawRightX = activeEndX - startX + LauncherTabsScroller.Bounds.X;
                 if (drawLeftX < LauncherTabsScroller.Bounds.X)
                 {
-                    x = LauncherTabsScroller.Bounds.X;
-                    ctx.BeginFigure(new Point(x, y), true);
-                    y = 1;
-                    ctx.LineTo(new Point(x, y));
+                    ctx.BeginFigure(new Point(LauncherTabsScroller.Bounds.X, bottom), true);
+                    ctx.LineTo(new Point(LauncherTabsScroller.Bounds.X, 1));
                 }
                 else
                 {
-                    x = drawLeftX - 5;
-                    ctx.BeginFigure(new Point(x, y), true);
-                    x = drawLeftX;
-                    y -= 5;
-                    ctx.ArcTo(new Point(x, y), new Size(5, 5), angle, false, SweepDirection.CounterClockwise);
-                    y = 6;
-                    ctx.LineTo(new Point(x, y));
-                    x += 6;
-                    y = 1;
-                    ctx.ArcTo(new Point(x, y), new Size(6, 6), angle, false, SweepDirection.Clockwise);
+                    ctx.BeginFigure(new Point(drawLeftX - 5, bottom), true);
+                    ctx.ArcTo(new Point(drawLeftX, bottom - 5), cornerSize, angle, false, SweepDirection.CounterClockwise);
+                    ctx.LineTo(new Point(drawLeftX, 6));
+                    ctx.ArcTo(new Point(drawLeftX + 5, 1), cornerSize, angle, false, SweepDirection.Clockwise);
                 }
 
-                x = drawRightX - 6;
-
+                var drawRightX = activeEndX - startX + LauncherTabsScroller.Bounds.X;
                 if (drawRightX <= LauncherTabsScroller.Bounds.Right)
                 {
-                    ctx.LineTo(new Point(x, y));
-                    x = drawRightX;
-                    y = 6;
-                    ctx.ArcTo(new Point(x, y), new Size(6, 6), angle, false, SweepDirection.Clockwise);
-                    y = height + 0.5 - 5;
-                    ctx.LineTo(new Point(x, y));
-                    x += 5;
-                    y = height + 0.5;
-                    ctx.ArcTo(new Point(x, y), new Size(5, 5), angle, false, SweepDirection.CounterClockwise);
+                    ctx.LineTo(new Point(drawRightX - 5, 1));
+                    ctx.ArcTo(new Point(drawRightX, 6), cornerSize, angle, false, SweepDirection.Clockwise);
+                    ctx.LineTo(new Point(drawRightX, bottom - 5));
+                    ctx.ArcTo(new Point(drawRightX + 5, bottom), cornerSize, angle, false, SweepDirection.CounterClockwise);
                 }
                 else
                 {
-                    x = LauncherTabsScroller.Bounds.Right;
-                    ctx.LineTo(new Point(x, y));
-                    y = height + 0.5;
-                    ctx.LineTo(new Point(x, y));
+                    ctx.LineTo(new Point(LauncherTabsScroller.Bounds.Right, 1));
+                    ctx.LineTo(new Point(LauncherTabsScroller.Bounds.Right, bottom));
                 }
             }
 

From 29690c7fba8ddff6aeb500b2b405d7495b23b139 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: Wed, 24 Dec 2025 20:33:43 -0600
Subject: [PATCH 39/51] localization: update Spanish translation (#2006)

- Add missing strings.
---
 src/Resources/Locales/es_ES.axaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index f15b4b87d..0aa2d2483 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -480,6 +480,7 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Ir a la página anterior</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Crear nueva página</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Abrir diálogo de preferencias</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.ShowWorkspaceDropdownMenu" xml:space="preserve">Mostrar menú desplegable del espacio de trabajo</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">Cambiar página activa</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITORIO</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Commit cambios staged</x:String>
@@ -555,6 +556,8 @@
   <x:String x:Key="Text.PageTabBar.Tab.CloseOther" xml:space="preserve">Cerrar Otras Pestañas</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CloseRight" xml:space="preserve">Cerrar Pestañas a la Derecha</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">Copiar Ruta del Repositorio</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.MoveToWorkspace" xml:space="preserve">Mover al Espacio de trabajo</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.Refresh" xml:space="preserve">Actualizar</x:String>
   <x:String x:Key="Text.PageTabBar.Welcome.Title" xml:space="preserve">Repositorios</x:String>
   <x:String x:Key="Text.Paste" xml:space="preserve">Pegar</x:String>
   <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">Hace {0} días</x:String>
@@ -590,6 +593,10 @@
   <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Usar ancho de pestaña fijo en la barra de título</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Usar marco de ventana nativo</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">HERRAMIENTA DIFF/MERGE</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.DiffArgs" xml:space="preserve">Argumentos para Diff</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.DiffArgs.Tip" xml:space="preserve">Variables disponibles: $LOCAL, $REMOTE</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.MergeArgs" xml:space="preserve">Argumentos para Merge</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.MergeArgs.Tip" xml:space="preserve">Variables disponibles: $BASE, $LOCAL, $REMOTE, $MERGED</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Ruta de instalación</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">Introducir ruta para la herramienta diff/merge</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">Herramienta</x:String>
@@ -630,6 +637,8 @@
   <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">Clave de firma gpg del usuario</x:String>
   <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">INTEGRACIÓN</x:String>
   <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">SHELL/TERMINAL</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Args" xml:space="preserve">Argumentos</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Args.Tip" xml:space="preserve">Por favor utiliza '.' para indicar el directorio de trabajo</x:String>
   <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">Ruta</x:String>
   <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">Shell/Terminal</x:String>
   <x:String x:Key="Text.PruneRemote" xml:space="preserve">Podar Remoto</x:String>
@@ -793,6 +802,9 @@
   <x:String x:Key="Text.SetUpstream.Upstream" xml:space="preserve">Upstream:</x:String>
   <x:String x:Key="Text.SHALinkCM.CopySHA" xml:space="preserve">Copiar SHA</x:String>
   <x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">Ir a</x:String>
+  <x:String x:Key="Text.SquashOrFixup.Squash" xml:space="preserve">Squash HEAD en el Padre</x:String>
+  <x:String x:Key="Text.SquashOrFixup.Fixup" xml:space="preserve">Fixup HEAD en el Padre</x:String>
+  <x:String x:Key="Text.SquashOrFixup.Into" xml:space="preserve">En:</x:String>
   <x:String x:Key="Text.SSHKey" xml:space="preserve">Clave Privada SSH:</x:String>
   <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>

From ab51702b6274aa1e8cb33350b989f079d1c50d10 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 25 Dec 2025 02:33:55 +0000
Subject: [PATCH 40/51] 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 17e17fce7..4014aadf9 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -25,25 +25,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.69%25-yellow)
-
-<details>
-<summary>Missing keys in es_ES.axaml</summary>
-
-- Text.Hotkeys.Global.ShowWorkspaceDropdownMenu
-- Text.PageTabBar.Tab.MoveToWorkspace
-- Text.PageTabBar.Tab.Refresh
-- Text.Preferences.DiffMerge.DiffArgs
-- Text.Preferences.DiffMerge.DiffArgs.Tip
-- Text.Preferences.DiffMerge.MergeArgs
-- Text.Preferences.DiffMerge.MergeArgs.Tip
-- Text.Preferences.Shell.Args
-- Text.Preferences.Shell.Args.Tip
-- Text.SquashOrFixup.Squash
-- Text.SquashOrFixup.Fixup
-- Text.SquashOrFixup.Into
-
-</details>
+### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 
 ### ![fr__FR](https://img.shields.io/badge/fr__FR-98.04%25-yellow)
 

From 823949aff2faa4883675307bad5bc7ca673a18e4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 25 Dec 2025 15:48:21 +0800
Subject: [PATCH 41/51] ux: fix tab border blur (anti-aliased)

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

diff --git a/src/Views/LauncherTabBar.axaml.cs b/src/Views/LauncherTabBar.axaml.cs
index 1f40aa98d..0f1d12068 100644
--- a/src/Views/LauncherTabBar.axaml.cs
+++ b/src/Views/LauncherTabBar.axaml.cs
@@ -69,7 +69,7 @@ public override void Render(DrawingContext context)
 
             var selectedIdx = LauncherTabsList.SelectedIndex;
             var count = LauncherTabsList.ItemCount;
-            var separatorPen = new Pen(this.FindResource("Brush.FG2") as IBrush, 0.5);
+            var separatorPen = new Pen(this.FindResource("Brush.FG2") as IBrush);
             var separatorY = (height - 18) * 0.5 + 1;
 
             if (!IsScrollerVisible && selectedIdx > 0)
@@ -77,7 +77,7 @@ public override void Render(DrawingContext context)
                 var container = LauncherTabsList.ContainerFromIndex(0);
                 if (container != null)
                 {
-                    var x = container.Bounds.Left - startX + LauncherTabsScroller.Bounds.X;
+                    var x = container.Bounds.Left - startX + LauncherTabsScroller.Bounds.X - 0.5;
                     context.DrawLine(separatorPen, new Point(x, separatorY), new Point(x, separatorY + 18));
                 }
             }
@@ -98,7 +98,7 @@ public override void Render(DrawingContext context)
                 if (IsScrollerVisible && i == count - 1)
                     break;
 
-                var separatorX = containerEndX - startX + LauncherTabsScroller.Bounds.X;
+                var separatorX = containerEndX - startX + LauncherTabsScroller.Bounds.X - 0.5;
                 context.DrawLine(separatorPen, new Point(separatorX, separatorY), new Point(separatorX, separatorY + 18));
             }
 
@@ -121,29 +121,29 @@ public override void Render(DrawingContext context)
                 var drawLeftX = activeStartX - startX + LauncherTabsScroller.Bounds.X;
                 if (drawLeftX < LauncherTabsScroller.Bounds.X)
                 {
-                    ctx.BeginFigure(new Point(LauncherTabsScroller.Bounds.X, bottom), true);
-                    ctx.LineTo(new Point(LauncherTabsScroller.Bounds.X, 1));
+                    ctx.BeginFigure(new Point(LauncherTabsScroller.Bounds.X - 0.5, bottom), true);
+                    ctx.LineTo(new Point(LauncherTabsScroller.Bounds.X - 0.5, 0.5));
                 }
                 else
                 {
-                    ctx.BeginFigure(new Point(drawLeftX - 5, bottom), true);
-                    ctx.ArcTo(new Point(drawLeftX, bottom - 5), cornerSize, angle, false, SweepDirection.CounterClockwise);
-                    ctx.LineTo(new Point(drawLeftX, 6));
-                    ctx.ArcTo(new Point(drawLeftX + 5, 1), cornerSize, angle, false, SweepDirection.Clockwise);
+                    ctx.BeginFigure(new Point(drawLeftX - 5.5, bottom), true);
+                    ctx.ArcTo(new Point(drawLeftX - 0.5, bottom - 5), cornerSize, angle, false, SweepDirection.CounterClockwise);
+                    ctx.LineTo(new Point(drawLeftX - 0.5, 5.5));
+                    ctx.ArcTo(new Point(drawLeftX + 4.5, 0.5), cornerSize, angle, false, SweepDirection.Clockwise);
                 }
 
                 var drawRightX = activeEndX - startX + LauncherTabsScroller.Bounds.X;
                 if (drawRightX <= LauncherTabsScroller.Bounds.Right)
                 {
-                    ctx.LineTo(new Point(drawRightX - 5, 1));
-                    ctx.ArcTo(new Point(drawRightX, 6), cornerSize, angle, false, SweepDirection.Clockwise);
-                    ctx.LineTo(new Point(drawRightX, bottom - 5));
-                    ctx.ArcTo(new Point(drawRightX + 5, bottom), cornerSize, angle, false, SweepDirection.CounterClockwise);
+                    ctx.LineTo(new Point(drawRightX - 5.5, 0.5));
+                    ctx.ArcTo(new Point(drawRightX - 0.5, 5.5), cornerSize, angle, false, SweepDirection.Clockwise);
+                    ctx.LineTo(new Point(drawRightX - 0.5, bottom - 5));
+                    ctx.ArcTo(new Point(drawRightX + 4.5, bottom), cornerSize, angle, false, SweepDirection.CounterClockwise);
                 }
                 else
                 {
-                    ctx.LineTo(new Point(LauncherTabsScroller.Bounds.Right, 1));
-                    ctx.LineTo(new Point(LauncherTabsScroller.Bounds.Right, bottom));
+                    ctx.LineTo(new Point(LauncherTabsScroller.Bounds.Right - 0.5, 0.5));
+                    ctx.LineTo(new Point(LauncherTabsScroller.Bounds.Right - 0.5, bottom));
                 }
             }
 

From fdaf96029d22e1a67565f6aabd63089503124fd7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 25 Dec 2025 17:25:35 +0800
Subject: [PATCH 42/51] ux: use transparent tab separator pen

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

diff --git a/src/Views/LauncherTabBar.axaml.cs b/src/Views/LauncherTabBar.axaml.cs
index 0f1d12068..4497cc2c5 100644
--- a/src/Views/LauncherTabBar.axaml.cs
+++ b/src/Views/LauncherTabBar.axaml.cs
@@ -5,6 +5,7 @@
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using Avalonia.Styling;
 
 namespace SourceGit.Views
 {
@@ -69,7 +70,7 @@ public override void Render(DrawingContext context)
 
             var selectedIdx = LauncherTabsList.SelectedIndex;
             var count = LauncherTabsList.ItemCount;
-            var separatorPen = new Pen(this.FindResource("Brush.FG2") as IBrush);
+            var separatorPen = new Pen(new SolidColorBrush(ActualThemeVariant == ThemeVariant.Dark ? Colors.White : Colors.Black, 0.2));
             var separatorY = (height - 18) * 0.5 + 1;
 
             if (!IsScrollerVisible && selectedIdx > 0)
@@ -152,6 +153,14 @@ public override void Render(DrawingContext context)
             context.DrawGeometry(fill, stroke, geo);
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property.Name == nameof(ActualThemeVariant))
+                InvalidateVisual();
+        }
+
         private void ScrollTabs(object _, PointerWheelEventArgs e)
         {
             if (!e.KeyModifiers.HasFlag(KeyModifiers.Shift))

From 27289eb901a590e655913a36de436b74fe4236e4 Mon Sep 17 00:00:00 2001
From: ybeapps <ybeapps@gmail.com>
Date: Fri, 26 Dec 2025 04:19:58 +0200
Subject: [PATCH 43/51] doc: simplify Homebrew installation instructions
 (#2007)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removed brew tap requirement as SourceGit is now available in the official Homebrew Cask repository. 🎉🎉🎉🎉🎉🎉🎉🎉🎉
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 05bd7a46b..c4ac40081 100644
--- a/README.md
+++ b/README.md
@@ -104,9 +104,8 @@ For **Windows** users:
 
 For **macOS** users:
 
-* Thanks [@ybeapps](https://github.com/ybeapps) for making `SourceGit` available on `Homebrew`. You can simply install it with following command:
+* Thanks [@ybeapps](https://github.com/ybeapps) for making `SourceGit` available on `Homebrew`:
   ```shell
-  brew tap ybeapps/homebrew-sourcegit
   brew install --cask sourcegit
   ```
 * If you want to install `SourceGit.app` from GitHub Release manually, you need run following command to make sure it works:

From 11351af67237bad13c6d6ded663ab6108f5c236b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 26 Dec 2025 10:52:26 +0800
Subject: [PATCH 44/51] ux: commit ref custom renderer

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

diff --git a/src/Views/CommitRefsPresenter.cs b/src/Views/CommitRefsPresenter.cs
index d3d0bdae6..a6ed72646 100644
--- a/src/Views/CommitRefsPresenter.cs
+++ b/src/Views/CommitRefsPresenter.cs
@@ -116,18 +116,18 @@ public override void Render(DrawingContext context)
             var fg = Foreground;
             var bg = Background;
             var allowWrap = AllowWrap;
-            var x = 1.0;
-            var y = 0.0;
+            var x = 1.5;
+            var y = 0.5;
 
             foreach (var item in _items)
             {
-                if (allowWrap && x > 1.0 && x + item.Width > Bounds.Width)
+                if (allowWrap && x > 1.5 && x + item.Width > Bounds.Width)
                 {
-                    x = 1.0;
+                    x = 1.5;
                     y += 20.0;
                 }
 
-                var entireRect = new RoundedRect(new Rect(x, y, item.Width, 16), new CornerRadius(2));
+                var entireRect = new RoundedRect(new Rect(x, y, item.Width, 16), new CornerRadius(4));
 
                 if (item.IsHead)
                 {
@@ -147,7 +147,7 @@ public override void Render(DrawingContext context)
                     if (bg != null)
                         context.DrawRectangle(bg, null, entireRect);
 
-                    var labelRect = new RoundedRect(new Rect(x + 16, y, item.Label.Width + 8, 16), new CornerRadius(0, 2, 2, 0));
+                    var labelRect = new RoundedRect(new Rect(x + 16, y, item.Label.Width + 8, 16), new CornerRadius(0, 4, 4, 0));
                     using (context.PushOpacity(.2))
                         context.DrawRectangle(item.Brush, null, labelRect);
 

From 974c30b39c93a9c089a8d6bd3333828724d30469 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 26 Dec 2025 11:07:56 +0800
Subject: [PATCH 45/51] ux: tooltip icon position

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Preferences.axaml         | 13 +++++++------
 src/Views/RepositoryConfigure.axaml | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 37d83012f..0d5c3f8d3 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -758,12 +758,13 @@
                     </TextBox>
 
                     <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Configure.CustomAction.Arguments}"/>
-                    <Grid Margin="0,4,0,0" ColumnDefinitions="*,Auto">
-                      <TextBox Grid.Column="0" CornerRadius="3" Height="28" Text="{Binding Arguments, Mode=TwoWay}"/>
-                      <Border Grid.Column="1" Width="22" Height="28" Background="Transparent" VerticalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Configure.CustomAction.Arguments.Tip}">
-                        <Path Width="14" Height="14" Data="{StaticResource Icons.Info}"/>
-                      </Border>
-                    </Grid>
+                    <TextBox Margin="0,4,0,0" Height="28" CornerRadius="3" Text="{Binding Arguments, Mode=TwoWay}">
+                      <TextBox.InnerRightContent>
+                        <Border Width="28" Height="28" Background="Transparent" VerticalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Configure.CustomAction.Arguments.Tip}">
+                          <Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="{DynamicResource Brush.FG1}"/>
+                        </Border>
+                      </TextBox.InnerRightContent>
+                    </TextBox>
 
                     <CheckBox Margin="0,8,0,0" Content="{DynamicResource Text.Configure.CustomAction.WaitForExit}" IsChecked="{Binding WaitForExit, Mode=TwoWay}"/>
                   </StackPanel>
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index ef472c321..df979c54e 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -514,12 +514,13 @@
                   </TextBox>
 
                   <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Configure.CustomAction.Arguments}"/>
-                  <Grid Margin="0,4,0,0" ColumnDefinitions="*,Auto">
-                    <TextBox Grid.Column="0" CornerRadius="3" Height="28" Text="{Binding Arguments, Mode=TwoWay}"/>
-                    <Border Grid.Column="1" Width="22" Height="28" Background="Transparent" VerticalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Configure.CustomAction.Arguments.Tip}">
-                      <Path Width="14" Height="14" Data="{StaticResource Icons.Info}"/>
-                    </Border>
-                  </Grid>
+                  <TextBox Margin="0,4,0,0" Height="28" CornerRadius="3" Text="{Binding Arguments, Mode=TwoWay}">
+                    <TextBox.InnerRightContent>
+                      <Border Width="28" Height="28" Background="Transparent" VerticalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Configure.CustomAction.Arguments.Tip}">
+                        <Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="{DynamicResource Brush.FG1}"/>
+                      </Border>
+                    </TextBox.InnerRightContent>
+                  </TextBox>
 
                   <CheckBox Margin="0,8,0,0" Content="{DynamicResource Text.Configure.CustomAction.WaitForExit}" IsChecked="{Binding WaitForExit, Mode=TwoWay}"/>
                 </StackPanel>

From e30ed896e22e92bcfed0c0bb4375d203526d562d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 26 Dec 2025 16:57:42 +0800
Subject: [PATCH 46/51] refactor: use `git reset HEAD
 --pathspec-from-file=<pathspec>` instead of `git restore --staged
 --pathspec-from-file=<pathspec>` to unstage files

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Discard.cs       |  2 +-
 src/Commands/Reset.cs         |  7 +++++++
 src/Commands/Restore.cs       | 14 +++-----------
 src/ViewModels/WorkingCopy.cs |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Commands/Discard.cs b/src/Commands/Discard.cs
index cbf38bd49..aad589112 100644
--- a/src/Commands/Discard.cs
+++ b/src/Commands/Discard.cs
@@ -86,7 +86,7 @@ public static async Task ChangesAsync(string repo, List<Models.Change> changes,
             {
                 var pathSpecFile = Path.GetTempFileName();
                 await File.WriteAllLinesAsync(pathSpecFile, restores).ConfigureAwait(false);
-                await new Restore(repo, pathSpecFile, false).Use(log).ExecAsync().ConfigureAwait(false);
+                await new Restore(repo, pathSpecFile).Use(log).ExecAsync().ConfigureAwait(false);
                 File.Delete(pathSpecFile);
             }
         }
diff --git a/src/Commands/Reset.cs b/src/Commands/Reset.cs
index 6a54533b1..cfcd337af 100644
--- a/src/Commands/Reset.cs
+++ b/src/Commands/Reset.cs
@@ -8,5 +8,12 @@ public Reset(string repo, string revision, string mode)
             Context = repo;
             Args = $"reset {mode} {revision}";
         }
+
+        public Reset(string repo, string pathspec)
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+            Args = $"reset HEAD --pathspec-from-file={pathspec.Quoted()}";
+        }
     }
 }
diff --git a/src/Commands/Restore.cs b/src/Commands/Restore.cs
index 49b760a4a..bf3bd0a55 100644
--- a/src/Commands/Restore.cs
+++ b/src/Commands/Restore.cs
@@ -1,20 +1,12 @@
-using System.Text;
-
-namespace SourceGit.Commands
+namespace SourceGit.Commands
 {
     public class Restore : Command
     {
-        public Restore(string repo, string pathspecFile, bool isStaged)
+        public Restore(string repo, string pathspecFile)
         {
             WorkingDirectory = repo;
             Context = repo;
-
-            var builder = new StringBuilder();
-            builder.Append("restore --progress ");
-            builder.Append(isStaged ? "--staged " : "--worktree --recurse-submodules ");
-            builder.Append("--pathspec-from-file=").Append(pathspecFile.Quoted());
-
-            Args = builder.ToString();
+            Args = $"restore --progress --worktree --recurse-submodules --pathspec-from-file={pathspecFile.Quoted()}";
         }
     }
 }
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 578b3fd86..e8838721d 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -393,7 +393,7 @@ public async Task UnstageChangesAsync(List<Models.Change> changes, Models.Change
                     }
                 }
 
-                await new Commands.Restore(_repo.FullPath, pathSpecFile, true).Use(log).ExecAsync();
+                await new Commands.Reset(_repo.FullPath, pathSpecFile).Use(log).ExecAsync();
                 File.Delete(pathSpecFile);
             }
             log.Complete();

From 120a331151e937a72bf249c33c4d7ddc56a4f8b6 Mon Sep 17 00:00:00 2001
From: ybeapps <ybeapps@gmail.com>
Date: Fri, 26 Dec 2025 11:07:30 +0200
Subject: [PATCH 47/51] feat: webhook to release to homebrew (#2010)

this triggers a full workflow that eventually create a PR in hombrew-cask repo
when this PR gets merged - all brew users can consume the new version
---
 .github/workflows/homebrew-notify.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/homebrew-notify.yml

diff --git a/.github/workflows/homebrew-notify.yml b/.github/workflows/homebrew-notify.yml
new file mode 100644
index 000000000..d0538b37a
--- /dev/null
+++ b/.github/workflows/homebrew-notify.yml
@@ -0,0 +1,22 @@
+name: Notify Homebrew Tap
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  notify-homebrew:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify Homebrew tap
+        env:
+          TAG: ${{ github.event.release.tag_name }}
+          HOMEBREW_TAP_REPO_TOKEN: ${{ secrets.HOMEBREW_TAP_REPO_TOKEN }}
+        run: |
+          echo "📢 Notifying Homebrew tap of new release $TAG..."
+          curl -X POST \
+            -H "Authorization: token $HOMEBREW_TAP_REPO_TOKEN" \
+            -H "Accept: application/vnd.github.v3+json" \
+            https://api.github.com/repos/ybeapps/homebrew-sourcegit/dispatches \
+            -d "{\"event_type\":\"new-sourcegit-release\",\"client_payload\":{\"version\":\"$TAG\"}}"
+          echo "✅ Homebrew tap notified successfully"

From a273cad23bb9f7a811fa26477e782a55dc36b0b7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 26 Dec 2025 20:34:16 +0800
Subject: [PATCH 48/51] fix: worktree file status not updated (#2011)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/Watcher.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index 03b4ca5f2..cdeddd65f 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -333,14 +333,13 @@ private void HandleWorkingCopyFileChanged(string name, string fullpath)
 
         private bool IsInSubmodule(string folder)
         {
+            if (string.IsNullOrEmpty(folder) || folder.Equals(_root, StringComparison.Ordinal))
+                return false;
+
             if (File.Exists($"{folder}/.git"))
                 return true;
 
-            var parent = Path.GetDirectoryName(folder);
-            if (parent == null || parent.Equals(_root, StringComparison.Ordinal))
-                return false;
-
-            return IsInSubmodule(parent);
+            return IsInSubmodule(Path.GetDirectoryName(folder));
         }
 
         private readonly IRepository _repo;

From 283f84f6e61877248f1b1613ef23d0357bab0336 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 26 Dec 2025 20:43:34 +0800
Subject: [PATCH 49/51] fix: checking if current worktree file changed

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

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index e8838721d..f7c131c65 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -807,7 +807,7 @@ private bool IsChanged(List<Models.Change> old, List<Models.Change> cur)
             {
                 var o = old[idx];
                 var c = cur[idx];
-                if (o.Path.Equals(c.Path, StringComparison.Ordinal) || o.Index != c.Index || o.WorkTree != c.WorkTree)
+                if (!o.Path.Equals(c.Path, StringComparison.Ordinal) || o.Index != c.Index || o.WorkTree != c.WorkTree)
                     return true;
             }
 

From df3acffc06065035ec769fa544628a6993df2a46 Mon Sep 17 00:00:00 2001
From: Sina Hinderks <sina@hinderks.net>
Date: Mon, 29 Dec 2025 03:28:34 +0100
Subject: [PATCH 50/51] fix: extra empty lines in diff (Windows) (#2015)

When using CR/LF as newline on Windows, there were extra empty lines
shown in diffs.

Commit b84b79 fixed a regression (#1996) by keeping CRs as content of
diff lines instead of removing them.  Additionally since commit 796f88
(#1543) the output for diffs uses the default newline depending on
platform, that's CR/LF on Windows.

As consequence on Windows with files containing CR/LF as newlines the
content (ending in CR) and the default newline CR/LF resulted in CR CR
LF, which is interpreted as two line breaks instead of one.

So b84b79 introduced itself a regression that's fixed in this commit by
partially reverting commit 796f88.

This fixes #2001.
---
 src/Views/TextDiffView.axaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index ff3438124..18646a414 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -931,7 +931,7 @@ protected override void OnDataContextChanged(EventArgs e)
                     if (line.NoNewLineEndOfFile)
                         builder.Append("\u26D4");
 
-                    builder.AppendLine();
+                    builder.Append('\n');
                 }
 
                 Text = builder.ToString();
@@ -1121,7 +1121,7 @@ protected override void OnDataContextChanged(EventArgs e)
                     if (line.NoNewLineEndOfFile)
                         builder.Append("\u26D4");
 
-                    builder.AppendLine();
+                    builder.Append('\n');
                 }
 
                 Text = builder.ToString();

From 31a2833ae690a2ce69f5665ab4a76a90d9f25b6a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Dec 2025 10:35:18 +0800
Subject: [PATCH 51/51] version: Release 2025.41

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

diff --git a/VERSION b/VERSION
index 1eb5f2619..dff1fb957 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.40
\ No newline at end of file
+2025.41
\ No newline at end of file