Merge branch 'release/v2025.20'

2025-06-15 15:44:59 +00:00 · 2025-06-03 09:27:03 +08:00 · 2025-06-03 09:27:03 +08:00 · 0594196dee
commit 0594196dee
parent 4887252870 425395da29
58 changed files with 569 additions and 419 deletions
--- a/README.md
+++ b/README.md
@ -54,7 +54,7 @@ You can find the current translation status in [TRANSLATION.md](https://github.c

 ## How to Use

-**To use this tool, you need to install Git(>=2.23.0) first.**
+**To use this tool, you need to install Git(>=2.25.1) first.**

 You can download the latest stable from [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) or download workflow artifacts from [Github Actions](https://github.com/sourcegit-scm/sourcegit/actions) to try this app based on latest commits.

--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository

 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)

-### ![de__DE](https://img.shields.io/badge/de__DE-96.75%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-96.50%25-yellow)

 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@ -26,6 +26,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Launcher.Workspaces
 - Text.Launcher.Pages
 - Text.Pull.RecurseSubmodules
+- Text.Repository.ClearStashes
 - Text.Repository.ShowSubmodulesAsTree
 - Text.ResetWithoutCheckout
 - Text.ResetWithoutCheckout.MoveTo
@ -37,19 +38,13 @@ This document shows the translation status of each locale file in the repository
 - Text.Submodule.Status.RevisionChanged
 - Text.Submodule.Status.Unmerged
 - Text.Submodule.URL
+- Text.WorkingCopy.ResetAuthor

 </details>

-### ![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)

-<details>
-<summary>Missing keys in es_ES.axaml</summary>
-
- Text.CreateBranch.OverwriteExisting
-
-</details>
-
-### ![fr__FR](https://img.shields.io/badge/fr__FR-92.62%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-92.38%25-yellow)

 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@ -90,6 +85,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
 - Text.Repository.BranchSort.ByName
+- Text.Repository.ClearStashes
 - Text.Repository.Search.ByContent
 - Text.Repository.ShowSubmodulesAsTree
 - Text.Repository.ViewLogs
@ -113,10 +109,11 @@ This document shows the translation status of each locale file in the repository
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
 - Text.WorkingCopy.Conflicts.UseMine
 - Text.WorkingCopy.Conflicts.UseTheirs
+- Text.WorkingCopy.ResetAuthor

 </details>

-### ![it__IT](https://img.shields.io/badge/it__IT-98.00%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-97.75%25-yellow)

 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@ -133,14 +130,16 @@ This document shows the translation status of each locale file in the repository
 - Text.Launcher.Workspaces
 - Text.Launcher.Pages
 - Text.Pull.RecurseSubmodules
+- Text.Repository.ClearStashes
 - Text.ResetWithoutCheckout
 - Text.ResetWithoutCheckout.MoveTo
 - Text.ResetWithoutCheckout.Target
 - Text.Submodule.Deinit
+- Text.WorkingCopy.ResetAuthor

 </details>

-### ![ja__JP](https://img.shields.io/badge/ja__JP-92.37%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-92.01%25-yellow)

 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@ -152,6 +151,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.BranchCM.CompareWithCurrent
 - Text.BranchCM.ResetToSelectedCommit
 - Text.Checkout.RecurseSubmodules
 - Text.CommitCM.CopyAuthor
@ -181,6 +181,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
 - Text.Repository.BranchSort.ByName
+- Text.Repository.ClearStashes
 - Text.Repository.FilterCommits
 - Text.Repository.Search.ByContent
 - Text.Repository.ShowSubmodulesAsTree
@ -206,10 +207,11 @@ This document shows the translation status of each locale file in the repository
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
 - Text.WorkingCopy.Conflicts.UseMine
 - Text.WorkingCopy.Conflicts.UseTheirs
+- Text.WorkingCopy.ResetAuthor

 </details>

-### ![pt__BR](https://img.shields.io/badge/pt__BR-84.23%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-84.02%25-yellow)

 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@ -294,6 +296,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
 - Text.Repository.BranchSort.ByName
+- Text.Repository.ClearStashes
 - Text.Repository.FilterCommits
 - Text.Repository.HistoriesLayout
 - Text.Repository.HistoriesLayout.Horizontal
@ -339,13 +342,23 @@ This document shows the translation status of each locale file in the repository
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
 - Text.WorkingCopy.Conflicts.UseMine
 - Text.WorkingCopy.Conflicts.UseTheirs
+- Text.WorkingCopy.ResetAuthor
 - Text.WorkingCopy.SignOff

 </details>

-### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.63%25-yellow)

-### ![ta__IN](https://img.shields.io/badge/ta__IN-92.62%25-yellow)
+<details>
+<summary>Missing keys in ru_RU.axaml</summary>
+
+- Text.BranchCM.CompareWithCurrent
+- Text.Repository.ClearStashes
+- Text.WorkingCopy.ResetAuthor
+
+</details>
+
+### ![ta__IN](https://img.shields.io/badge/ta__IN-92.26%25-yellow)

 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@ -357,6 +370,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.BranchCM.CompareWithCurrent
 - Text.BranchCM.ResetToSelectedCommit
 - Text.Checkout.RecurseSubmodules
 - Text.CommitCM.CopyAuthor
@ -386,6 +400,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
 - Text.Repository.BranchSort.ByName
+- Text.Repository.ClearStashes
 - Text.Repository.Search.ByContent
 - Text.Repository.ShowSubmodulesAsTree
 - Text.Repository.ViewLogs
@ -409,10 +424,11 @@ This document shows the translation status of each locale file in the repository
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
 - Text.WorkingCopy.Conflicts.UseMine
 - Text.WorkingCopy.Conflicts.UseTheirs
+- Text.WorkingCopy.ResetAuthor

 </details>

-### ![uk__UA](https://img.shields.io/badge/uk__UA-93.74%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-93.51%25-yellow)

 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@ -449,6 +465,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
 - Text.Repository.BranchSort.ByName
+- Text.Repository.ClearStashes
 - Text.Repository.Search.ByContent
 - Text.Repository.ShowSubmodulesAsTree
 - Text.Repository.ViewLogs
@ -467,6 +484,7 @@ This document shows the translation status of each locale file in the repository
 - Text.ViewLogs.Clear
 - Text.ViewLogs.CopyLog
 - Text.ViewLogs.Delete
+- Text.WorkingCopy.ResetAuthor

 </details>

--- a/2
+++ b/2
@ -1 +1 @@
-2025.19
+2025.20
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@ -393,7 +393,17 @@ namespace SourceGit
                _ipcChannel = new Models.IpcChannel();
                if (!_ipcChannel.IsFirstInstance)
                {
-                    _ipcChannel.SendToFirstInstance(desktop.Args is { Length: 1 } ? desktop.Args[0] : string.Empty);
+                    var arg = desktop.Args is { Length: > 0 } ? desktop.Args[0].Trim() : string.Empty;
+                    if (!string.IsNullOrEmpty(arg))
+                    {
+                        if (arg.StartsWith('"') && arg.EndsWith('"'))
+                            arg = arg.Substring(1, arg.Length - 2).Trim();
+
+                        if (arg.Length > 0 && !Path.IsPathFullyQualified(arg))
+                            arg = Path.GetFullPath(arg);
+                    }
+
+                    _ipcChannel.SendToFirstInstance(arg);
                    Environment.Exit(0);
                }
                else
--- a/src/Commands/Add.cs
+++ b/src/Commands/Add.cs
@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Text;
-
-namespace SourceGit.Commands
+namespace SourceGit.Commands
 {
    public class Add : Command
    {
@ -12,20 +9,11 @@ namespace SourceGit.Commands
            Args = includeUntracked ? "add ." : "add -u .";
        }

-        public Add(string repo, List<string> changes)
+        public Add(string repo, Models.Change change)
        {
            WorkingDirectory = repo;
            Context = repo;
-
-            var builder = new StringBuilder();
-            builder.Append("add --");
-            foreach (var c in changes)
-            {
-                builder.Append(" \"");
-                builder.Append(c);
-                builder.Append("\"");
-            }
-            Args = builder.ToString();
+            Args = $"add -- \"{change.Path}\"";
        }

        public Add(string repo, string pathspecFromFile)
--- a/src/Commands/Checkout.cs
+++ b/src/Commands/Checkout.cs
@ -27,9 +27,9 @@ namespace SourceGit.Commands
        {
            var builder = new StringBuilder();
            builder.Append("checkout --progress ");
-            builder.Append(allowOverwrite ? "-B " : "-b ");
            if (force)
                builder.Append("--force ");
+            builder.Append(allowOverwrite ? "-B " : "-b ");
            builder.Append(branch);
            builder.Append(" ");
            builder.Append(basedOn);
--- a/src/Commands/Commit.cs
+++ b/src/Commands/Commit.cs
@ -4,7 +4,7 @@ namespace SourceGit.Commands
 {
    public class Commit : Command
    {
-        public Commit(string repo, string message, bool amend, bool signOff)
+        public Commit(string repo, string message, bool signOff, bool amend, bool resetAuthor)
        {
            _tmpFile = Path.GetTempFileName();
            File.WriteAllText(_tmpFile, message);
@ -12,10 +12,10 @@ namespace SourceGit.Commands
            WorkingDirectory = repo;
            Context = repo;
            Args = $"commit --allow-empty --file=\"{_tmpFile}\"";
-            if (amend)
-                Args += " --amend --no-edit";
            if (signOff)
                Args += " --signoff";
+            if (amend)
+                Args += resetAuthor ? " --amend --reset-author --no-edit" : " --amend --no-edit";
        }

        public bool Run()
--- a/src/Commands/Discard.cs
+++ b/src/Commands/Discard.cs
@ -8,6 +8,12 @@ namespace SourceGit.Commands
 {
    public static class Discard
    {
+        /// <summary>
+        ///     Discard all local changes (unstaged & staged)
+        /// </summary>
+        /// <param name="repo"></param>
+        /// <param name="includeIgnored"></param>
+        /// <param name="log"></param>
        public static void All(string repo, bool includeIgnored, Models.ICommandLog log)
        {
            var changes = new QueryLocalChanges(repo).Result();
@ -36,11 +42,18 @@ namespace SourceGit.Commands
                });
            }

-            new Restore(repo) { Log = log }.Exec();
+            new Reset(repo, "HEAD", "--hard") { Log = log }.Exec();
+
            if (includeIgnored)
                new Clean(repo) { Log = log }.Exec();
        }

+        /// <summary>
+        ///     Discard selected changes (only unstaged).
+        /// </summary>
+        /// <param name="repo"></param>
+        /// <param name="changes"></param>
+        /// <param name="log"></param>
        public static void Changes(string repo, List<Models.Change> changes, Models.ICommandLog log)
        {
            var restores = new List<string>();
@ -71,10 +84,12 @@ namespace SourceGit.Commands
                });
            }

-            for (int i = 0; i < restores.Count; i += 10)
+            if (restores.Count > 0)
            {
-                var count = Math.Min(10, restores.Count - i);
-                new Restore(repo, restores.GetRange(i, count), "--worktree --recurse-submodules") { Log = log }.Exec();
+                var pathSpecFile = Path.GetTempFileName();
+                File.WriteAllLines(pathSpecFile, restores);
+                new Restore(repo, pathSpecFile, false) { Log = log }.Exec();
+                File.Delete(pathSpecFile);
            }
        }
    }
--- a/src/Commands/FormatPatch.cs
+++ b/src/Commands/FormatPatch.cs
@ -6,6 +6,7 @@
        {
            WorkingDirectory = repo;
            Context = repo;
+            Editor = EditorType.None;
            Args = $"format-patch {commit} -1 --output=\"{saveTo}\"";
        }
    }
--- a/src/Commands/QueryLocalChanges.cs
+++ b/src/Commands/QueryLocalChanges.cs
@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+
 using Avalonia.Threading;

 namespace SourceGit.Commands
@ -121,19 +122,32 @@ namespace SourceGit.Commands
                    case "CD":
                        change.Set(Models.ChangeState.Copied, Models.ChangeState.Deleted);
                        break;
-                    case "DR":
-                        change.Set(Models.ChangeState.Deleted, Models.ChangeState.Renamed);
-                        break;
-                    case "DC":
-                        change.Set(Models.ChangeState.Deleted, Models.ChangeState.Copied);
-                        break;
                    case "DD":
+                        change.ConflictReason = Models.ConflictReason.BothDeleted;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                    case "AU":
+                        change.ConflictReason = Models.ConflictReason.AddedByUs;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                    case "UD":
+                        change.ConflictReason = Models.ConflictReason.DeletedByThem;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                    case "UA":
+                        change.ConflictReason = Models.ConflictReason.AddedByThem;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                    case "DU":
+                        change.ConflictReason = Models.ConflictReason.DeletedByUs;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                    case "AA":
+                        change.ConflictReason = Models.ConflictReason.BothAdded;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                    case "UU":
+                        change.ConflictReason = Models.ConflictReason.BothModified;
                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
                        break;
                    case "??":
--- a/src/Commands/QueryStashChanges.cs
+++ b/src/Commands/QueryStashChanges.cs
@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-namespace SourceGit.Commands
-{
-    /// <summary>
-    /// Query stash changes. Requires git >= 2.32.0
-    /// </summary>
-    public partial class QueryStashChanges : Command
-    {
-        [GeneratedRegex(@"^([MADC])\s+(.+)$")]
-        private static partial Regex REG_FORMAT();
-        [GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
-        private static partial Regex REG_RENAME_FORMAT();
-
-        public QueryStashChanges(string repo, string stash)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-            Args = $"stash show -u --name-status \"{stash}\"";
-        }
-
-        public List<Models.Change> Result()
-        {
-            var rs = ReadToEnd();
-            if (!rs.IsSuccess)
-                return [];
-
-            var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
-            var outs = new List<Models.Change>();
-            foreach (var line in lines)
-            {
-                var match = REG_FORMAT().Match(line);
-                if (!match.Success)
-                {
-                    match = REG_RENAME_FORMAT().Match(line);
-                    if (match.Success)
-                    {
-                        var renamed = new Models.Change() { Path = match.Groups[1].Value };
-                        renamed.Set(Models.ChangeState.Renamed);
-                        outs.Add(renamed);
-                    }
-
-                    continue;
-                }
-
-                var change = new Models.Change() { Path = match.Groups[2].Value };
-                var status = match.Groups[1].Value;
-
-                switch (status[0])
-                {
-                    case 'M':
-                        change.Set(Models.ChangeState.Modified);
-                        outs.Add(change);
-                        break;
-                    case 'A':
-                        change.Set(Models.ChangeState.Added);
-                        outs.Add(change);
-                        break;
-                    case 'D':
-                        change.Set(Models.ChangeState.Deleted);
-                        outs.Add(change);
-                        break;
-                    case 'C':
-                        change.Set(Models.ChangeState.Copied);
-                        outs.Add(change);
-                        break;
-                }
-            }
-
-            outs.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
-            return outs;
-        }
-    }
-}
--- a/src/Commands/Reset.cs
+++ b/src/Commands/Reset.cs
@ -1,33 +1,7 @@
-using System.Collections.Generic;
-using System.Text;
-
-namespace SourceGit.Commands
+namespace SourceGit.Commands
 {
    public class Reset : Command
    {
-        public Reset(string repo)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-            Args = "reset";
-        }
-
-        public Reset(string repo, List<Models.Change> changes)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-
-            var builder = new StringBuilder();
-            builder.Append("reset --");
-            foreach (var c in changes)
-            {
-                builder.Append(" \"");
-                builder.Append(c.Path);
-                builder.Append("\"");
-            }
-            Args = builder.ToString();
-        }
-
        public Reset(string repo, string revision, string mode)
        {
            WorkingDirectory = repo;
--- a/src/Commands/Restore.cs
+++ b/src/Commands/Restore.cs
@ -1,29 +1,52 @@
-using System.Collections.Generic;
-using System.Text;
+using System.Text;

 namespace SourceGit.Commands
 {
    public class Restore : Command
    {
-        public Restore(string repo)
+        /// <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;
-            Args = "restore . --source=HEAD --staged --worktree --recurse-submodules";
+
+            var builder = new StringBuilder();
+            builder.Append("restore --staged -- \"");
+            builder.Append(stagedChange.Path);
+            builder.Append('"');
+
+            if (stagedChange.Index == Models.ChangeState.Renamed)
+            {
+                builder.Append(" \"");
+                builder.Append(stagedChange.OriginalPath);
+                builder.Append('"');
+            }
+
+            Args = builder.ToString();
        }

-        public Restore(string repo, List<string> files, string extra)
+        /// <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;

-            StringBuilder builder = new StringBuilder();
+            var builder = new StringBuilder();
            builder.Append("restore ");
-            if (!string.IsNullOrEmpty(extra))
-                builder.Append(extra).Append(" ");
-            builder.Append("--");
-            foreach (var f in files)
-                builder.Append(' ').Append('"').Append(f).Append('"');
+            builder.Append(isStaged ? "--staged " : "--worktree --recurse-submodules ");
+            builder.Append("--pathspec-from-file=\"");
+            builder.Append(pathspecFile);
+            builder.Append('"');
+
            Args = builder.ToString();
        }
    }
--- a/src/Commands/Tag.cs
+++ b/src/Commands/Tag.cs
@ -28,12 +28,13 @@ namespace SourceGit.Commands
                string tmp = Path.GetTempFileName();
                File.WriteAllText(tmp, message);
                cmd.Args += $"-F \"{tmp}\"";
-            }
-            else
-            {
-                cmd.Args += $"-m {name}";
+
+                var succ = cmd.Exec();
+                File.Delete(tmp);
+                return succ;
            }

+            cmd.Args += $"-m {name}";
            return cmd.Exec();
        }

--- a/src/Models/Change.cs
+++ b/src/Models/Change.cs
@ -22,6 +22,18 @@ namespace SourceGit.Models
        Conflicted,
    }

+    public enum ConflictReason
+    {
+        None,
+        BothDeleted,
+        AddedByUs,
+        DeletedByThem,
+        AddedByThem,
+        DeletedByUs,
+        BothAdded,
+        BothModified,
+    }
+
    public class ChangeDataForAmend
    {
        public string FileMode { get; set; } = "";
@ -36,7 +48,14 @@ namespace SourceGit.Models
        public string Path { get; set; } = "";
        public string OriginalPath { get; set; } = "";
        public ChangeDataForAmend DataForAmend { get; set; } = null;
+        public ConflictReason ConflictReason { get; set; } = ConflictReason.None;
+
        public bool IsConflicted => WorkTree == ChangeState.Conflicted;
+        public string ConflictMarker => CONFLICT_MARKERS[(int)ConflictReason];
+        public string ConflictDesc => CONFLICT_DESCS[(int)ConflictReason];
+
+        public string WorkTreeDesc => TYPE_DESCS[(int)WorkTree];
+        public string IndexDesc => TYPE_DESCS[(int)Index];

        public void Set(ChangeState index, ChangeState workTree = ChangeState.None)
        {
@ -68,5 +87,40 @@ namespace SourceGit.Models
            if (!string.IsNullOrEmpty(OriginalPath) && OriginalPath[0] == '"')
                OriginalPath = OriginalPath.Substring(1, OriginalPath.Length - 2);
        }
+
+        private static readonly string[] TYPE_DESCS =
+        [
+            "Unknown",
+            "Modified",
+            "Type Changed",
+            "Added",
+            "Deleted",
+            "Renamed",
+            "Copied",
+            "Untracked",
+            "Conflict"
+        ];
+        private static readonly string[] CONFLICT_MARKERS =
+        [
+            string.Empty,
+            "DD",
+            "AU",
+            "UD",
+            "UA",
+            "DU",
+            "AA",
+            "UU"
+        ];
+        private static readonly string[] CONFLICT_DESCS =
+        [
+            string.Empty,
+            "Both deleted",
+            "Added by us",
+            "Deleted by them",
+            "Added by them",
+            "Deleted by us",
+            "Both added",
+            "Both modified"
+        ];
    }
 }
--- a/src/Models/GitVersions.cs
+++ b/src/Models/GitVersions.cs
@ -5,26 +5,16 @@
        /// <summary>
        ///     The minimal version of Git that required by this app.
        /// </summary>
-        public static readonly System.Version MINIMAL = new System.Version(2, 23, 0);
-
-        /// <summary>
-        ///     The minimal version of Git that supports the `add` command with the `--pathspec-from-file` option.
-        /// </summary>
-        public static readonly System.Version ADD_WITH_PATHSPECFILE = new System.Version(2, 25, 0);
+        public static readonly System.Version MINIMAL = new(2, 25, 1);

        /// <summary>
        ///     The minimal version of Git that supports the `stash push` command with the `--pathspec-from-file` option.
        /// </summary>
-        public static readonly System.Version STASH_PUSH_WITH_PATHSPECFILE = new System.Version(2, 26, 0);
+        public static readonly System.Version STASH_PUSH_WITH_PATHSPECFILE = new(2, 26, 0);

        /// <summary>
        ///     The minimal version of Git that supports the `stash push` command with the `--staged` option.
        /// </summary>
-        public static readonly System.Version STASH_PUSH_ONLY_STAGED = new System.Version(2, 35, 0);
-
-        /// <summary>
-        ///     The minimal version of Git that supports the `stash show` command with the `-u` option.
-        /// </summary>
-        public static readonly System.Version STASH_SHOW_WITH_UNTRACKED = new System.Version(2, 32, 0);
+        public static readonly System.Version STASH_PUSH_ONLY_STAGED = new(2, 35, 0);
    }
 }
--- a/src/Models/Statistics.cs
+++ b/src/Models/Statistics.cs
@ -26,25 +26,23 @@ namespace SourceGit.Models

    public class StatisticsReport
    {
-        public static readonly string[] WEEKDAYS = ["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"];
-
        public int Total { get; set; } = 0;
-        public List<StatisticsAuthor> Authors { get; set; } = new List<StatisticsAuthor>();
-        public List<ISeries> Series { get; set; } = new List<ISeries>();
-        public List<Axis> XAxes { get; set; } = new List<Axis>();
-        public List<Axis> YAxes { get; set; } = new List<Axis>();
+        public List<StatisticsAuthor> Authors { get; set; } = new();
+        public List<ISeries> Series { get; set; } = new();
+        public List<Axis> XAxes { get; set; } = new();
+        public List<Axis> YAxes { get; set; } = new();
        public StatisticsAuthor SelectedAuthor { get => _selectedAuthor; set => ChangeAuthor(value); }

        public StatisticsReport(StatisticsMode mode, DateTime start)
        {
            _mode = mode;

-            YAxes = [new Axis()
+            YAxes.Add(new Axis()
            {
                TextSize = 10,
                MinLimit = 0,
                SeparatorsPaint = new SolidColorPaint(new SKColor(0x40808080)) { StrokeThickness = 1 }
-            }];
+            });

            if (mode == StatisticsMode.ThisWeek)
            {
@ -72,7 +70,7 @@ namespace SourceGit.Models
        {
            Total++;

-            var normalized = DateTime.MinValue;
+            DateTime normalized;
            if (_mode == StatisticsMode.ThisWeek || _mode == StatisticsMode.ThisMonth)
                normalized = time.Date;
            else
@ -172,26 +170,27 @@ namespace SourceGit.Models
            ChangeColor(_fillColor);
        }

-        private StatisticsMode _mode = StatisticsMode.All;
-        private Dictionary<User, int> _mapUsers = new Dictionary<User, int>();
-        private Dictionary<DateTime, int> _mapSamples = new Dictionary<DateTime, int>();
-        private Dictionary<User, Dictionary<DateTime, int>> _mapUserSamples = new Dictionary<User, Dictionary<DateTime, int>>();
+        private static readonly string[] WEEKDAYS = ["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"];
+        private StatisticsMode _mode;
+        private Dictionary<User, int> _mapUsers = new();
+        private Dictionary<DateTime, int> _mapSamples = new();
+        private Dictionary<User, Dictionary<DateTime, int>> _mapUserSamples = new();
        private StatisticsAuthor _selectedAuthor = null;
        private uint _fillColor = 255;
    }

    public class Statistics
    {
-        public StatisticsReport All { get; set; }
-        public StatisticsReport Month { get; set; }
-        public StatisticsReport Week { get; set; }
+        public StatisticsReport All { get; }
+        public StatisticsReport Month { get; }
+        public StatisticsReport Week { get; }

        public Statistics()
        {
-            _today = DateTime.Now.ToLocalTime().Date;
-            var weekOffset = (7 + (int)_today.DayOfWeek - (int)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek) % 7;
-            _thisWeekStart = _today.AddDays(-weekOffset);
-            _thisMonthStart = _today.AddDays(1 - _today.Day);
+            var today = DateTime.Now.ToLocalTime().Date;
+            var weekOffset = (7 + (int)today.DayOfWeek - (int)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek) % 7;
+            _thisWeekStart = today.AddDays(-weekOffset);
+            _thisMonthStart = today.AddDays(1 - today.Day);

            All = new StatisticsReport(StatisticsMode.All, DateTime.MinValue);
            Month = new StatisticsReport(StatisticsMode.ThisMonth, _thisMonthStart);
@ -200,7 +199,13 @@ namespace SourceGit.Models

        public void AddCommit(string author, double timestamp)
        {
-            var user = User.FindOrAdd(author);
+            var emailIdx = author.IndexOf('±', StringComparison.Ordinal);
+            var email = author.Substring(emailIdx + 1).ToLower(CultureInfo.CurrentCulture);
+            if (!_users.TryGetValue(email, out var user))
+            {
+                user = User.FindOrAdd(author);
+                _users.Add(email, user);
+            }

            var time = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime();
            if (time >= _thisWeekStart)
@ -214,13 +219,15 @@ namespace SourceGit.Models

        public void Complete()
        {
+            _users.Clear();
+
            All.Complete();
            Month.Complete();
            Week.Complete();
        }

-        private readonly DateTime _today;
        private readonly DateTime _thisMonthStart;
        private readonly DateTime _thisWeekStart;
+        private readonly Dictionary<string, User> _users = new();
    }
 }
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@ -50,13 +50,12 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME WIRD BEI DIESER DATEI NICHT UNTERSTÜTZT!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Auschecken von ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Mit HEAD vergleichen</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Mit ${0}$ vergleichen</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Mit Worktree vergleichen</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Branch-Namen kopieren</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Benutzerdefinierte Aktion</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Lösche ${0}$...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Lösche alle ausgewählten {0} Branches</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Alle Änderungen verwerfen</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Fast-Forward zu ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Fetche ${0}$ in ${1}$ hinein...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Abschließen ${0}$</x:String>
@ -502,7 +501,7 @@
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Globale Git Benutzer Email</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Aktivere --prune beim fetchen</x:String>
  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">Aktiviere --ignore-cr-at-eol beim Unterschied</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Diese App setzt Git (&gt;= 2.23.0) voraus</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Diese App setzt Git (&gt;= 2.25.1) voraus</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Installationspfad</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Aktiviere HTTP SSL Verifizierung</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Benutzername</x:String>
@ -583,6 +582,7 @@
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">WEITER</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Benutzerdefinierte Aktionen</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">Keine benutzerdefinierten Aktionen</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">Alle Änderungen verwerfen</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Aktiviere '--reflog' Option</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Öffne im Datei-Browser</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Suche Branches/Tags/Submodule</x:String>
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@ -46,13 +46,12 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME ON THIS FILE IS NOT SUPPORTED!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Compare with HEAD</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Compare with ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Compare with Worktree</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copy Branch Name</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Custom Action</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Delete ${0}$...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Delete selected {0} branches</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Discard all changes</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Fast-Forward to ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Fetch ${0}$ into ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Finish ${0}$</x:String>
@ -512,7 +511,7 @@
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Global git user email</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Enable --prune on fetch</x:String>
  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">Enable --ignore-cr-at-eol in diff</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.23.0) is required by this app</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.25.1) is required by this app</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Install Path</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Enable HTTP SSL Verify</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">User Name</x:String>
@ -590,10 +589,12 @@
  <x:String x:Key="Text.Repository.Clean" xml:space="preserve">Cleanup(GC &amp; Prune)</x:String>
  <x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">Run `git gc` command for this repository.</x:String>
  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">Clear all</x:String>
+  <x:String x:Key="Text.Repository.ClearStashes" xml:space="preserve">Clear</x:String>
  <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configure this repository</x:String>
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUE</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Custom Actions</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">No Custom Actions</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">Discard all changes</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Enable '--reflog' Option</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Open in File Browser</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Search Branches/Tags/Submodules</x:String>
@ -781,6 +782,7 @@
  <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUDE UNTRACKED FILES</x:String>
  <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NO RECENT INPUT MESSAGES</x:String>
  <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NO COMMIT TEMPLATES</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResetAuthor" xml:space="preserve">Reset Author</x:String>
  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Right-click the selected file(s), and make your choice to resolve conflicts.</x:String>
  <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">SignOff</x:String>
  <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">STAGED</x:String>
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@ -50,13 +50,12 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">¡BLAME EN ESTE ARCHIVO NO SOPORTADO!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparar con HEAD</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Comparar con ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparar con Worktree</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copiar Nombre de Rama</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Acción personalizada</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Eliminar ${0}$...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Eliminar {0} ramas seleccionadas</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Descartar todos los cambios</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Fast-Forward a ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Fetch ${0}$ en ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Finalizar ${0}$</x:String>
@ -221,6 +220,7 @@
  <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Introduzca el nombre de la rama.</x:String>
  <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">Los espacios serán reemplazados con guiones.</x:String>
  <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Crear Rama Local</x:String>
+  <x:String x:Key="Text.CreateBranch.OverwriteExisting" xml:space="preserve">Sobrescribir la rama existente</x:String>
  <x:String x:Key="Text.CreateTag" xml:space="preserve">Crear Etiqueta...</x:String>
  <x:String x:Key="Text.CreateTag.BasedOn" xml:space="preserve">Nueva Etiqueta En:</x:String>
  <x:String x:Key="Text.CreateTag.GPGSign" xml:space="preserve">Firma GPG</x:String>
@ -515,7 +515,7 @@
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email global del usuario git</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Habilitar --prune para fetch</x:String>
  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">Habilitar --ignore-cr-at-eol en diff</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Se requiere Git (&gt;= 2.23.0) para esta aplicación</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Se requiere Git (&gt;= 2.25.1) para esta aplicación</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Ruta de instalación</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Habilitar verificación HTTP SSL</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nombre de usuario</x:String>
@ -593,10 +593,12 @@
  <x:String x:Key="Text.Repository.Clean" xml:space="preserve">Limpiar (GC &amp; Prune)</x:String>
  <x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">Ejecutar comando `git gc` para este repositorio.</x:String>
  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">Limpiar todo</x:String>
+  <x:String x:Key="Text.Repository.ClearStashes" xml:space="preserve">Limpiar</x:String>
  <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configurar este repositorio</x:String>
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUAR</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Acciones Personalizadas</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">No hay ninguna Acción Personalizada</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">Descartar todos los cambios</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Habilitar Opción '--reflog'</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Abrir en el Explorador</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Buscar Ramas/Etiquetas/Submódulos</x:String>
@ -784,6 +786,7 @@
  <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUIR ARCHIVOS NO RASTREADOS</x:String>
  <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NO HAY MENSAJES DE ENTRADA RECIENTES</x:String>
  <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NO HAY PLANTILLAS DE COMMIT</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResetAuthor" xml:space="preserve">Restablecer Autor</x:String>
  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Haz clic derecho en el(los) archivo(s) seleccionado(s) y elige tu opción para resolver conflictos.</x:String>
  <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">Firmar</x:String>
  <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">STAGED</x:String>
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@ -43,13 +43,12 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blâme</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">LE BLÂME SUR CE FICHIER N'EST PAS SUPPORTÉ!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Récupérer ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparer avec HEAD</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Comparer avec ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparer avec le worktree</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copier le nom de la branche</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Action personnalisée</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Supprimer ${0}$...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Supprimer {0} branches sélectionnées</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Rejeter tous les changements</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Fast-Forward vers ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Fetch ${0}$ vers ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Terminer ${0}$</x:String>
@ -484,7 +483,7 @@
  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">E-mail utilsateur</x:String>
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">E-mail utilsateur global</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Activer --prune pour fetch</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Cette application requière Git (&gt;= 2.23.0)</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Cette application requière Git (&gt;= 2.25.1)</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Chemin d'installation</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Activer la vérification HTTP SSL</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nom d'utilisateur</x:String>
@ -562,6 +561,7 @@
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUER</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Actions personnalisées</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">Pas d'actions personnalisées</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">Rejeter tous les changements</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Activer l'option '--reflog'</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Ouvrir dans l'explorateur de fichiers</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Rechercher Branches/Tags/Submodules</x:String>
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@ -50,13 +50,12 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Attribuisci</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">L'ATTRIBUZIONE SU QUESTO FILE NON È SUPPORTATA!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Confronta con HEAD</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Confronta con ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Confronta con Worktree</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copia Nome Branch</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Azione personalizzata</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Elimina ${0}$...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Elimina i {0} branch selezionati</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Scarta tutte le modifiche</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Avanzamento Veloce a ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Recupera ${0}$ in ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Completa ${0}$</x:String>
@ -505,7 +504,7 @@
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email utente Git globale</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Abilita --prune durante il fetch</x:String>
  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">Abilita --ignore-cr-at-eol nel diff</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Questa applicazione richiede Git (&gt;= 2.23.0)</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Questa applicazione richiede Git (&gt;= 2.25.1)</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Percorso Installazione</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Abilita la verifica HTTP SSL</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nome Utente</x:String>
@ -586,6 +585,7 @@
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUA</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Azioni Personalizzate</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">Nessuna Azione Personalizzata</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">Scarta tutte le modifiche</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Abilita opzione '--reflog'</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Apri nell'Esplora File</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Cerca Branch/Tag/Sottomodulo</x:String>
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@ -43,13 +43,11 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAMEではこのファイルはサポートされていません!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">${0}$ をチェックアウトする...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">HEADと比較</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">ワークツリーと比較</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">ブランチ名をコピー</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">カスタムアクション</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">${0}$を削除...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">選択中の{0}個のブランチを削除</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">すべての変更を破棄</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">${0}$ へ早送りする</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">${0}$ から ${1}$ へフェッチする</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Finish ${0}$</x:String>
@ -484,7 +482,7 @@
  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">ユーザー Eメールアドレス</x:String>
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">グローバルgitのEメールアドレス</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">フェッチ時に--pruneを有効化</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.23.0) はこのアプリで必要です</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.25.1) はこのアプリで必要です</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">インストール パス</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">HTTP SSL 検証を有効にする</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">ユーザー名</x:String>
@ -562,6 +560,7 @@
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">続ける</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">カスタムアクション</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">カスタムアクションがありません</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">すべての変更を破棄</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">`--reflog` オプションを有効化</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">ファイルブラウザーで開く</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">ブランチ/タグ/サブモジュールを検索</x:String>
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@ -37,12 +37,11 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME NESTE ARQUIVO NÃO É SUPORTADO!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparar com HEAD</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Comparar com ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparar com Worktree</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copiar Nome do Branch</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Excluir ${0}$...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Excluir {0} branches selecionados</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Descartar todas as alterações</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Fast-Forward para ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Buscar ${0}$ em ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Finalizar ${0}$</x:String>
@ -441,7 +440,7 @@
  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email do Usuário</x:String>
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Email global do usuário git</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Habilita --prune ao buscar</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.23.0) é necessário para este aplicativo</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.25.1) é necessário para este aplicativo</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Caminho de Instalação</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Nome do Usuário</x:String>
  <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Nome global do usuário git</x:String>
@ -518,6 +517,7 @@
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUAR</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Ações customizada</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">Nenhuma ação customizada</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">Descartar todas as alterações</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Habilitar opção '--reflog'</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Abrir no Navegador de Arquivos</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Pesquisar Branches/Tags/Submódulos</x:String>
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@ -50,13 +50,11 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Расследование</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">РАССЛЕДОВАНИЕ В ЭТОМ ФАЙЛЕ НЕ ПОДДЕРЖИВАЕТСЯ!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Переключиться на ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Сравнить с ГОЛОВОЙ (HEAD)</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Сравнить с рабочим каталогом</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Копировать имя ветки</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Изменить действие</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Удалить ${0}$...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Удалить выбранные {0} ветки</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Отклонить все изменения.</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Перемотать вперёд к ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Извлечь ${0}$ в ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git-процесс - Завершение ${0}$</x:String>
@ -516,7 +514,7 @@
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Общая электроная почта пользователя git</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Разрешить (--prune) при скачивании</x:String>
  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">Разрешить (--ignore-cr-at-eol) в сравнении</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Для работы программы требуется версия Git (&gt;= 2.23.0)</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Для работы программы требуется версия Git (&gt;= 2.25.1)</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Путь установки</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Разрешить верификацию HTTP SSL</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Имя пользователя</x:String>
@ -598,6 +596,7 @@
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">ПРОДОЛЖИТЬ</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Изменить действия</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">Не изменять действия</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">Отклонить все изменения.</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Разрешить опцию --reflog</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Открыть в файловом менеджере</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Поиск веток, меток и подмодулей</x:String>
--- a/src/Resources/Locales/ta_IN.axaml
+++ b/src/Resources/Locales/ta_IN.axaml
@ -43,13 +43,11 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">குற்றச்சாட்டு</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">இந்த கோப்பில் குற்றம் சாட்ட ஆதரிக்கப்படவில்லை!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">${0}$ சரிபார்...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">தலையுடன் ஒப்பிடுக</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">பணிமரத்துடன் ஒப்பிடுக</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">கிளை பெயரை நகலெடு</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">தனிப்பயன் செயல்</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">${0}$ ஐ நீக்கு...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">தேர்ந்தெடுக்கப்பட்ட {0} கிளைகளை நீக்கு</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">எல்லா மாற்றங்களையும் நிராகரி</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">${0}$ இதற்கு வேகமாக முன்னோக்கிச் செல்</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">${0}$ ஐ ${1}$இல் பெறு...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">அறிவிலி ஓட்டம் - முடி ${0}$</x:String>
@ -484,7 +482,7 @@
  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">பயனர் மின்னஞ்சல்</x:String>
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">உலகளாவிய அறிவிலி பயனர் மின்னஞ்சல்</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">--prune எடுக்கும்போது இயக்கு</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">அறிவிலி (&gt;= 2.23.0) இந்த பயன்பாட்டிற்கு தேவைப்படுகிறது</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">அறிவிலி (&gt;= 2.25.1) இந்த பயன்பாட்டிற்கு தேவைப்படுகிறது</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">நிறுவல் பாதை</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">உஉபநெ பாகுஅ சரிபார்ப்பை இயக்கு</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">பயனர் பெயர்</x:String>
@ -562,6 +560,7 @@
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">தொடர்க</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">தனிப்பயன் செயல்கள்</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">தனிப்பயன் செயல்கள் இல்லை</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">எல்லா மாற்றங்களையும் நிராகரி</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">'--குறிபதிவு' விருப்பத்தை இயக்கு</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">கோப்பு உலாவியில் திற</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">கிளைகள்/குறிச்சொற்கள்/துணைத் தொகுதிகளைத் தேடு</x:String>
--- a/src/Resources/Locales/uk_UA.axaml
+++ b/src/Resources/Locales/uk_UA.axaml
@ -43,13 +43,12 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Автор рядка</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">ПОШУК АВТОРА РЯДКА ДЛЯ ЦЬОГО ФАЙЛУ НЕ ПІДТРИМУЄТЬСЯ!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Перейти на ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Порівняти з HEAD</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Порівняти з ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Порівняти з робочим деревом</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Копіювати назву гілки</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Спеціальна дія</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Видалити ${0}$...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Видалити вибрані {0} гілок</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Скасувати всі зміни</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Перемотати до ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Отримати ${0}$ в ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - Завершити ${0}$</x:String>
@ -488,7 +487,7 @@
  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">Email користувача</x:String>
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Глобальний email користувача git</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Увімкнути --prune при fetch</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.23.0) є обов'язковим для цієї програми</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.25.1) є обов'язковим для цієї програми</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Шлях встановлення</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Увімкнути перевірку HTTP SSL</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Ім'я користувача</x:String>
@ -566,6 +565,7 @@
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">ПРОДОВЖИТИ</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">Спеціальні дії</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">Немає спеціальних дій</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">Скасувати всі зміни</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Увімкнути опцію '--reflog'</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Відкрити у файловому менеджері</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Пошук гілок/тегів/підмодулів</x:String>
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@ -50,13 +50,12 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">逐行追溯(blame)</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">选中文件不支持该操作!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">检出(checkout) ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">与当前HEAD比较</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">与当前 ${0}$ 比较</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">与本地工作树比较</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">复制分支名</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">自定义操作</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">删除 ${0}$...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">删除选中的 {0} 个分支</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">放弃所有更改</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">快进(fast-forward)到 ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">拉取(fetch) ${0}$ 至 ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">GIT工作流 - 完成 ${0}$</x:String>
@ -516,7 +515,7 @@
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">默认GIT用户邮箱</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">拉取更新时启用修剪（--prune）</x:String>
  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">对比文件时，默认忽略换行符变更 (--ignore-cr-at-eol)</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">本软件要求GIT最低版本为2.23.0</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">本软件要求GIT最低版本为2.25.1</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">安装路径</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">启用HTTP SSL验证</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">用户名</x:String>
@ -594,10 +593,12 @@
  <x:String x:Key="Text.Repository.Clean" xml:space="preserve">清理本仓库(GC)</x:String>
  <x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">本操作将执行`git gc`命令。</x:String>
  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">清空过滤规则</x:String>
+  <x:String x:Key="Text.Repository.ClearStashes" xml:space="preserve">清空</x:String>
  <x:String x:Key="Text.Repository.Configure" xml:space="preserve">配置本仓库</x:String>
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">下一步</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">自定义操作</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">自定义操作未设置</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">放弃所有更改</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">启用 --reflog 选项</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">在文件浏览器中打开</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">快速查找分支/标签/子模块</x:String>
@ -785,6 +786,7 @@
  <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">显示未跟踪文件</x:String>
  <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">没有提交信息记录</x:String>
  <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">没有可应用的提交信息模板</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResetAuthor" xml:space="preserve">重置提交者</x:String>
  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">请选中冲突文件，打开右键菜单，选择合适的解决方式</x:String>
  <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">署名</x:String>
  <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">已暂存</x:String>
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@ -50,13 +50,12 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">逐行溯源 (blame)</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">所選擇的檔案不支援該操作!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">簽出 (checkout) ${0}$...</x:String>
-  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">與目前 HEAD 比較</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">與目前 ${0}$ 比較</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">與本機工作區比較</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">複製分支名稱</x:String>
  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">自訂動作</x:String>
  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">刪除 ${0}$...</x:String>
  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">刪除所選的 {0} 個分支</x:String>
-  <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">捨棄所有變更</x:String>
  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">快轉 (fast-forward) 到 ${0}$</x:String>
  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">提取 (fetch) ${0}$ 到 ${1}$...</x:String>
  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git 工作流 - 完成 ${0}$</x:String>
@ -516,7 +515,7 @@
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">預設 Git 使用者電子郵件</x:String>
  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">拉取變更時進行清理 (--prune)</x:String>
  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">對比檔案時，預設忽略行尾的 CR 變更 (--ignore-cr-at-eol)</x:String>
-  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">本軟體要求 Git 最低版本為 2.23.0</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">本軟體要求 Git 最低版本為 2.25.1</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">安裝路徑</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">啟用 HTTP SSL 驗證</x:String>
  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">使用者名稱</x:String>
@ -594,10 +593,12 @@
  <x:String x:Key="Text.Repository.Clean" xml:space="preserve">清理本存放庫 (GC)</x:String>
  <x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">本操作將執行 `git gc` 命令。</x:String>
  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">清空篩選規則</x:String>
+  <x:String x:Key="Text.Repository.ClearStashes" xml:space="preserve">清空</x:String>
  <x:String x:Key="Text.Repository.Configure" xml:space="preserve">設定本存放庫</x:String>
  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">下一步</x:String>
  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">自訂動作</x:String>
  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">沒有自訂的動作</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">捨棄所有變更</x:String>
  <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">啟用 [--reflog] 選項</x:String>
  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">在檔案瀏覽器中開啟</x:String>
  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">快速搜尋分支/標籤/子模組</x:String>
@ -785,6 +786,7 @@
  <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">顯示未追蹤檔案</x:String>
  <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">沒有提交訊息記錄</x:String>
  <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">沒有可套用的提交訊息範本</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResetAuthor" xml:space="preserve">重設作者</x:String>
  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">請選擇發生衝突的檔案，開啟右鍵選單，選擇合適的解決方式</x:String>
  <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">署名</x:String>
  <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">已暫存</x:String>
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@ -2,11 +2,9 @@
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
    <TargetFramework>net9.0</TargetFramework>
-    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
    <ApplicationManifest>App.manifest</ApplicationManifest>
    <ApplicationIcon>App.ico</ApplicationIcon>
    <Version>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)\\..\\VERSION"))</Version>
-    <BuiltInComInteropSupport>false</BuiltInComInteropSupport>
    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
    <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>

--- a/src/ViewModels/ChangeTreeNode.cs
+++ b/src/ViewModels/ChangeTreeNode.cs
@ -17,6 +17,16 @@ namespace SourceGit.ViewModels
            get => Change == null;
        }

+        public bool ShowConflictMarker
+        {
+            get => Change is { IsConflicted: true };
+        }
+
+        public string ConflictMarker
+        {
+            get => Change?.ConflictMarker ?? string.Empty;
+        }
+
        public bool IsExpanded
        {
            get => _isExpanded;
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@ -452,7 +452,9 @@ namespace SourceGit.ViewModels
                    var selected = await storageProvider.OpenFolderPickerAsync(options);
                    if (selected.Count == 1)
                    {
-                        var saveTo = Path.Combine(selected[0].Path.LocalPath, Path.GetFileName(file.Path));
+                        var folder = selected[0];
+                        var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
+                        var saveTo = Path.Combine(folderPath, Path.GetFileName(file.Path));
                        Commands.SaveRevisionFile.Run(_repo.FullPath, _commit.SHA, file.Path, saveTo);
                    }
                }
--- a/src/ViewModels/Conflict.cs
+++ b/src/ViewModels/Conflict.cs
@ -25,6 +25,16 @@ namespace SourceGit.ViewModels

    public class Conflict
    {
+        public string Marker
+        {
+            get => _change.ConflictMarker;
+        }
+
+        public string Description
+        {
+            get => _change.ConflictDesc;
+        }
+
        public object Theirs
        {
            get;
@ -41,7 +51,13 @@ namespace SourceGit.ViewModels
        {
            get;
            private set;
-        }
+        } = false;
+
+        public bool CanUseExternalMergeTool
+        {
+            get;
+            private set;
+        } = false;

        public Conflict(Repository repo, WorkingCopy wc, Models.Change change)
        {
@ -49,7 +65,11 @@ namespace SourceGit.ViewModels
            _change = change;

            var isSubmodule = repo.Submodules.Find(x => x.Path.Equals(change.Path, StringComparison.Ordinal)) != null;
-            IsResolved = !isSubmodule && new Commands.IsConflictResolved(repo.FullPath, change).Result();
+            if (!isSubmodule && (_change.ConflictReason == Models.ConflictReason.BothAdded || _change.ConflictReason == Models.ConflictReason.BothModified))
+            {
+                CanUseExternalMergeTool = true;
+                IsResolved = new Commands.IsConflictResolved(repo.FullPath, change).Result();
+            }

            var context = wc.InProgressContext;
            if (context is CherryPickInProgress cherryPick)
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@ -333,10 +333,12 @@ namespace SourceGit.ViewModels
                        {
                            log = _repo.CreateLog("Save as Patch");

+                            var folder = picker[0];
+                            var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
                            var succ = false;
                            for (var i = 0; i < selected.Count; i++)
                            {
-                                var saveTo = GetPatchFileName(picker[0].Path.LocalPath, selected[i], i);
+                                var saveTo = GetPatchFileName(folderPath, selected[i], i);
                                succ = await Task.Run(() => new Commands.FormatPatch(_repo.FullPath, selected[i].SHA, saveTo).Use(log).Exec());
                                if (!succ)
                                    break;
@ -691,8 +693,10 @@ namespace SourceGit.ViewModels
                    {
                        log = _repo.CreateLog("Save as Patch");

-                        var saveTo = GetPatchFileName(selected[0].Path.LocalPath, commit);
-                        var succ = new Commands.FormatPatch(_repo.FullPath, commit.SHA, saveTo).Use(log).Exec();
+                        var folder = selected[0];
+                        var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
+                        var saveTo = GetPatchFileName(folderPath, commit);
+                        var succ = await Task.Run(() => new Commands.FormatPatch(_repo.FullPath, commit.SHA, saveTo).Use(log).Exec());
                        if (succ)
                            App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
                    }
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@ -1766,6 +1766,18 @@ namespace SourceGit.ViewModels
            return menu;
        }

+        public void DiscardAllChanges()
+        {
+            if (CanCreatePopup())
+                ShowPopup(new Discard(this));
+        }
+
+        public void ClearStashes()
+        {
+            if (CanCreatePopup())
+                ShowPopup(new ClearStashes(this));
+        }
+
        public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch)
        {
            var menu = new ContextMenu();
@ -1785,19 +1797,6 @@ namespace SourceGit.ViewModels
            {
                if (!IsBare)
                {
-                    var discard = new MenuItem();
-                    discard.Header = App.Text("BranchCM.DiscardAll");
-                    discard.Icon = App.CreateMenuIcon("Icons.Undo");
-                    discard.Click += (_, e) =>
-                    {
-                        if (CanCreatePopup())
-                            ShowPopup(new Discard(this));
-                        e.Handled = true;
-                    };
-
-                    menu.Items.Add(discard);
-                    menu.Items.Add(new MenuItem() { Header = "-" });
-
                    if (!string.IsNullOrEmpty(branch.Upstream))
                    {
                        var upstream = branch.Upstream.Substring(13);
@ -1828,6 +1827,7 @@ namespace SourceGit.ViewModels
                        };

                        menu.Items.Add(fastForward);
+                        menu.Items.Add(new MenuItem() { Header = "-" });
                        menu.Items.Add(pull);
                    }
                }
@ -1866,21 +1866,6 @@ namespace SourceGit.ViewModels
                    };
                    menu.Items.Add(fastForward);

-                    var selectedCommit = (_histories?.DetailContext as CommitDetail)?.Commit;
-                    if (selectedCommit != null && !selectedCommit.SHA.Equals(branch.Head, StringComparison.Ordinal))
-                    {
-                        var move = new MenuItem();
-                        move.Header = App.Text("BranchCM.ResetToSelectedCommit", branch.Name, selectedCommit.SHA.Substring(0, 10));
-                        move.Icon = App.CreateMenuIcon("Icons.Reset");
-                        move.Click += (_, e) =>
-                        {
-                            if (CanCreatePopup())
-                                ShowPopup(new ResetWithoutCheckout(this, branch, selectedCommit));
-                            e.Handled = true;
-                        };
-                        menu.Items.Add(move);
-                    }
-
                    var fetchInto = new MenuItem();
                    fetchInto.Header = App.Text("BranchCM.FetchInto", upstream.FriendlyName, branch.Name);
                    fetchInto.Icon = App.CreateMenuIcon("Icons.Fetch");
@ -1924,15 +1909,34 @@ namespace SourceGit.ViewModels
                    menu.Items.Add(rebase);
                }

-                var compareWithHead = new MenuItem();
-                compareWithHead.Header = App.Text("BranchCM.CompareWithHead");
-                compareWithHead.Icon = App.CreateMenuIcon("Icons.Compare");
-                compareWithHead.Click += (_, _) =>
+                if (worktree == null)
+                {
+                    var selectedCommit = (_histories?.DetailContext as CommitDetail)?.Commit;
+                    if (selectedCommit != null && !selectedCommit.SHA.Equals(branch.Head, StringComparison.Ordinal))
+                    {
+                        var move = new MenuItem();
+                        move.Header = App.Text("BranchCM.ResetToSelectedCommit", branch.Name, selectedCommit.SHA.Substring(0, 10));
+                        move.Icon = App.CreateMenuIcon("Icons.Reset");
+                        move.Click += (_, e) =>
+                        {
+                            if (CanCreatePopup())
+                                ShowPopup(new ResetWithoutCheckout(this, branch, selectedCommit));
+                            e.Handled = true;
+                        };
+                        menu.Items.Add(new MenuItem() { Header = "-" });
+                        menu.Items.Add(move);
+                    }
+                }
+
+                var compareWithCurrent = new MenuItem();
+                compareWithCurrent.Header = App.Text("BranchCM.CompareWithCurrent", _currentBranch.Name);
+                compareWithCurrent.Icon = App.CreateMenuIcon("Icons.Compare");
+                compareWithCurrent.Click += (_, _) =>
                {
                    App.ShowWindow(new BranchCompare(_fullpath, branch, _currentBranch), false);
                };
                menu.Items.Add(new MenuItem() { Header = "-" });
-                menu.Items.Add(compareWithHead);
+                menu.Items.Add(compareWithCurrent);

                if (_localChangesCount > 0)
                {
--- a/src/ViewModels/Reword.cs
+++ b/src/ViewModels/Reword.cs
@ -37,9 +37,11 @@ namespace SourceGit.ViewModels
            var log = _repo.CreateLog("Reword HEAD");
            Use(log);

+            var signOff = _repo.Settings.EnableSignOffForCommit;
            return Task.Run(() =>
            {
-                var succ = new Commands.Commit(_repo.FullPath, _message, true, _repo.Settings.EnableSignOffForCommit).Use(log).Run();
+                // For reword (only changes the commit message), disable `--reset-author`
+                var succ = new Commands.Commit(_repo.FullPath, _message, signOff, true, false).Use(log).Run();
                log.Complete();
                CallUIThread(() => _repo.SetWatcherEnabled(true));
                return succ;
--- a/src/ViewModels/Squash.cs
+++ b/src/ViewModels/Squash.cs
@ -34,6 +34,7 @@ namespace SourceGit.ViewModels

            return Task.Run(() =>
            {
+                var signOff = _repo.Settings.EnableSignOffForCommit;
                var autoStashed = false;
                var succ = false;

@ -52,7 +53,7 @@ namespace SourceGit.ViewModels

                succ = new Commands.Reset(_repo.FullPath, Target.SHA, "--soft").Use(log).Exec();
                if (succ)
-                    succ = new Commands.Commit(_repo.FullPath, _message, true, _repo.Settings.EnableSignOffForCommit).Use(log).Run();
+                    succ = new Commands.Commit(_repo.FullPath, _message, signOff, true, false).Use(log).Run();

                if (succ && autoStashed)
                    new Commands.Stash(_repo.FullPath).Use(log).Pop("stash@{0}");
--- a/src/ViewModels/StashChanges.cs
+++ b/src/ViewModels/StashChanges.cs
@ -117,16 +117,16 @@ namespace SourceGit.ViewModels
                foreach (var c in changes)
                    paths.Add(c.Path);

-                var tmpFile = Path.GetTempFileName();
-                File.WriteAllLines(tmpFile, paths);
-                succ = new Commands.Stash(_repo.FullPath).Use(log).Push(Message, tmpFile, KeepIndex);
-                File.Delete(tmpFile);
+                var pathSpecFile = Path.GetTempFileName();
+                File.WriteAllLines(pathSpecFile, paths);
+                succ = new Commands.Stash(_repo.FullPath).Use(log).Push(Message, pathSpecFile, KeepIndex);
+                File.Delete(pathSpecFile);
            }
            else
            {
-                for (int i = 0; i < changes.Count; i += 10)
+                for (int i = 0; i < changes.Count; i += 32)
                {
-                    var count = Math.Min(10, changes.Count - i);
+                    var count = Math.Min(32, changes.Count - i);
                    var step = changes.GetRange(i, count);
                    succ = new Commands.Stash(_repo.FullPath).Use(log).Push(Message, step, KeepIndex);
                    if (!succ)
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@ -53,34 +53,32 @@ namespace SourceGit.ViewModels
                    if (value == null)
                    {
                        Changes = null;
+                        _untracked.Clear();
                    }
                    else
                    {
                        Task.Run(() =>
                        {
-                            var changes = null as List<Models.Change>;
+                            var changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result();
+                            var untracked = new List<Models.Change>();

-                            if (Native.OS.GitVersion >= Models.GitVersions.STASH_SHOW_WITH_UNTRACKED)
+                            if (value.Parents.Count == 3)
                            {
-                                changes = new Commands.QueryStashChanges(_repo.FullPath, value.Name).Result();
-                            }
-                            else
-                            {
-                                changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result();
-                                if (value.Parents.Count == 3)
-                                {
-                                    var untracked = new Commands.CompareRevisions(_repo.FullPath, Models.Commit.EmptyTreeSHA1, value.Parents[2]).Result();
-                                    var needSort = changes.Count > 0;
+                                untracked = new Commands.CompareRevisions(_repo.FullPath, Models.Commit.EmptyTreeSHA1, value.Parents[2]).Result();
+                                var needSort = changes.Count > 0 && untracked.Count > 0;

-                                    foreach (var c in untracked)
-                                        changes.Add(c);
+                                foreach (var c in untracked)
+                                    changes.Add(c);

-                                    if (needSort)
-                                        changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
-                                }
+                                if (needSort)
+                                    changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
                            }

-                            Dispatcher.UIThread.Invoke(() => Changes = changes);
+                            Dispatcher.UIThread.Invoke(() =>
+                            {
+                                _untracked = untracked;
+                                Changes = changes;
+                            });
                        });
                    }
                }
@ -106,7 +104,7 @@ namespace SourceGit.ViewModels
                {
                    if (value == null)
                        DiffContext = null;
-                    else if (value.Index == Models.ChangeState.Added && _selectedStash.Parents.Count == 3)
+                    else if (_untracked.Contains(value))
                        DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(Models.Commit.EmptyTreeSHA1, _selectedStash.Parents[2], value), _diffContext);
                    else
                        DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, value), _diffContext);
@ -129,6 +127,7 @@ namespace SourceGit.ViewModels
        {
            _stashes?.Clear();
            _changes?.Clear();
+            _untracked.Clear();

            _repo = null;
            _selectedStash = null;
@ -181,7 +180,7 @@ namespace SourceGit.ViewModels
                    var opts = new List<Models.DiffOption>();
                    foreach (var c in _changes)
                    {
-                        if (c.Index == Models.ChangeState.Added && _selectedStash.Parents.Count == 3)
+                        if (_untracked.Contains(c))
                            opts.Add(new Models.DiffOption(Models.Commit.EmptyTreeSHA1, _selectedStash.Parents[2], c));
                        else
                            opts.Add(new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, c));
@ -273,12 +272,6 @@ namespace SourceGit.ViewModels
            return menu;
        }

-        public void Clear()
-        {
-            if (_repo.CanCreatePopup())
-                _repo.ShowPopup(new ClearStashes(_repo));
-        }
-
        public void ClearSearchFilter()
        {
            SearchFilter = string.Empty;
@ -304,11 +297,12 @@ namespace SourceGit.ViewModels
        }

        private Repository _repo = null;
-        private List<Models.Stash> _stashes = new List<Models.Stash>();
-        private List<Models.Stash> _visibleStashes = new List<Models.Stash>();
+        private List<Models.Stash> _stashes = [];
+        private List<Models.Stash> _visibleStashes = [];
        private string _searchFilter = string.Empty;
        private Models.Stash _selectedStash = null;
        private List<Models.Change> _changes = null;
+        private List<Models.Change> _untracked = [];
        private Models.Change _selectedChange = null;
        private DiffContext _diffContext = null;
    }
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@ -91,6 +91,7 @@ namespace SourceGit.ViewModels
                    else
                    {
                        CommitMessage = string.Empty;
+                        ResetAuthor = false;
                    }

                    Staged = GetStagedChanges();
@ -100,6 +101,12 @@ namespace SourceGit.ViewModels
            }
        }

+        public bool ResetAuthor
+        {
+            get => _resetAuthor;
+            set => SetProperty(ref _resetAuthor, value);
+        }
+
        public string Filter
        {
            get => _filter;
@ -381,7 +388,9 @@ namespace SourceGit.ViewModels
                if (!change.IsConflicted)
                    continue;

-                if (change.WorkTree == Models.ChangeState.Deleted)
+                if (change.ConflictReason == Models.ConflictReason.BothDeleted ||
+                    change.ConflictReason == Models.ConflictReason.DeletedByThem ||
+                    change.ConflictReason == Models.ConflictReason.AddedByUs)
                {
                    var fullpath = Path.Combine(_repo.FullPath, change.Path);
                    if (File.Exists(fullpath))
@ -403,7 +412,12 @@ namespace SourceGit.ViewModels
            }

            if (needStage.Count > 0)
-                await Task.Run(() => new Commands.Add(_repo.FullPath, needStage).Use(log).Exec());
+            {
+                var pathSpecFile = Path.GetTempFileName();
+                await File.WriteAllLinesAsync(pathSpecFile, needStage);
+                await Task.Run(() => new Commands.Add(_repo.FullPath, pathSpecFile).Use(log).Exec());
+                File.Delete(pathSpecFile);
+            }

            log.Complete();
            _repo.MarkWorkingCopyDirtyManually();
@ -423,7 +437,9 @@ namespace SourceGit.ViewModels
                if (!change.IsConflicted)
                    continue;

-                if (change.Index == Models.ChangeState.Deleted)
+                if (change.ConflictReason == Models.ConflictReason.BothDeleted ||
+                    change.ConflictReason == Models.ConflictReason.DeletedByUs ||
+                    change.ConflictReason == Models.ConflictReason.AddedByThem)
                {
                    var fullpath = Path.Combine(_repo.FullPath, change.Path);
                    if (File.Exists(fullpath))
@ -445,7 +461,12 @@ namespace SourceGit.ViewModels
            }

            if (needStage.Count > 0)
-                await Task.Run(() => new Commands.Add(_repo.FullPath, needStage).Use(log).Exec());
+            {
+                var pathSpecFile = Path.GetTempFileName();
+                await File.WriteAllLinesAsync(pathSpecFile, needStage);
+                await Task.Run(() => new Commands.Add(_repo.FullPath, pathSpecFile).Use(log).Exec());
+                File.Delete(pathSpecFile);
+            }

            log.Complete();
            _repo.MarkWorkingCopyDirtyManually();
@ -456,7 +477,7 @@ namespace SourceGit.ViewModels
        {
            var toolType = Preferences.Instance.ExternalMergeToolType;
            var toolPath = Preferences.Instance.ExternalMergeToolPath;
-            var file = change?.Path; // NOTE: With no <file> arg, mergetool runs on on every file with merge conflicts!
+            var file = change?.Path; // NOTE: With no <file> arg, mergetool runs on every file with merge conflicts!
            await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, file));
        }

@ -759,7 +780,7 @@ namespace SourceGit.ViewModels
                        byParentFolder.IsVisible = !isRooted;
                        byParentFolder.Click += (_, e) =>
                        {
-                            var dir = Path.GetDirectoryName(change.Path).Replace("\\", "/");
+                            var dir = Path.GetDirectoryName(change.Path)!.Replace("\\", "/");
                            Commands.GitIgnore.Add(_repo.FullPath, dir + "/");
                            e.Handled = true;
                        };
@ -781,7 +802,7 @@ namespace SourceGit.ViewModels
                            byExtensionInSameFolder.IsVisible = !isRooted;
                            byExtensionInSameFolder.Click += (_, e) =>
                            {
-                                var dir = Path.GetDirectoryName(change.Path).Replace("\\", "/");
+                                var dir = Path.GetDirectoryName(change.Path)!.Replace("\\", "/");
                                Commands.GitIgnore.Add(_repo.FullPath, $"{dir}/*{extension}");
                                e.Handled = true;
                            };
@ -1608,30 +1629,19 @@ namespace SourceGit.ViewModels
            {
                await Task.Run(() => new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Use(log).Exec());
            }
-            else if (Native.OS.GitVersion >= Models.GitVersions.ADD_WITH_PATHSPECFILE)
-            {
-                var paths = new List<string>();
-                foreach (var c in changes)
-                    paths.Add(c.Path);
-
-                var tmpFile = Path.GetTempFileName();
-                File.WriteAllLines(tmpFile, paths);
-                await Task.Run(() => new Commands.Add(_repo.FullPath, tmpFile).Use(log).Exec());
-                File.Delete(tmpFile);
-            }
            else
            {
                var paths = new List<string>();
                foreach (var c in changes)
                    paths.Add(c.Path);

-                for (int i = 0; i < count; i += 10)
-                {
-                    var step = paths.GetRange(i, Math.Min(10, count - i));
-                    await Task.Run(() => new Commands.Add(_repo.FullPath, step).Use(log).Exec());
-                }
+                var pathSpecFile = Path.GetTempFileName();
+                await File.WriteAllLinesAsync(pathSpecFile, paths);
+                await Task.Run(() => new Commands.Add(_repo.FullPath, pathSpecFile).Use(log).Exec());
+                File.Delete(pathSpecFile);
            }
            log.Complete();
+
            _repo.MarkWorkingCopyDirtyManually();
            _repo.SetWatcherEnabled(true);
            IsStaging = false;
@ -1655,19 +1665,23 @@ namespace SourceGit.ViewModels
                log.AppendLine("$ git update-index --index-info ");
                await Task.Run(() => new Commands.UnstageChangesForAmend(_repo.FullPath, changes).Exec());
            }
-            else if (count == _staged.Count)
-            {
-                await Task.Run(() => new Commands.Reset(_repo.FullPath).Use(log).Exec());
-            }
            else
            {
-                for (int i = 0; i < count; i += 10)
+                var paths = new List<string>();
+                foreach (var c in changes)
                {
-                    var step = changes.GetRange(i, Math.Min(10, count - i));
-                    await Task.Run(() => new Commands.Reset(_repo.FullPath, step).Use(log).Exec());
+                    paths.Add(c.Path);
+                    if (c.Index == Models.ChangeState.Renamed)
+                        paths.Add(c.OriginalPath);
                }
+
+                var pathSpecFile = Path.GetTempFileName();
+                await File.WriteAllLinesAsync(pathSpecFile, paths);
+                await Task.Run(() => new Commands.Restore(_repo.FullPath, pathSpecFile, true).Use(log).Exec());
+                File.Delete(pathSpecFile);
            }
            log.Complete();
+
            _repo.MarkWorkingCopyDirtyManually();
            _repo.SetWatcherEnabled(true);
            IsUnstaging = false;
@ -1717,6 +1731,7 @@ namespace SourceGit.ViewModels
            _repo.Settings.PushCommitMessage(_commitMessage);
            _repo.SetWatcherEnabled(false);

+            var signOff = _repo.Settings.EnableSignOffForCommit;
            var log = _repo.CreateLog("Commit");
            Task.Run(() =>
            {
@ -1725,7 +1740,7 @@ namespace SourceGit.ViewModels
                    succ = new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Use(log).Exec();

                if (succ)
-                    succ = new Commands.Commit(_repo.FullPath, _commitMessage, _useAmend, _repo.Settings.EnableSignOffForCommit).Use(log).Run();
+                    succ = new Commands.Commit(_repo.FullPath, _commitMessage, signOff, _useAmend, _resetAuthor).Use(log).Run();

                log.Complete();

@ -1785,6 +1800,7 @@ namespace SourceGit.ViewModels
        private bool _isUnstaging = false;
        private bool _isCommitting = false;
        private bool _useAmend = false;
+        private bool _resetAuthor = false;
        private bool _hasRemotes = false;
        private List<Models.Change> _cached = [];
        private List<Models.Change> _unstaged = [];
--- a/src/Views/AddWorktree.axaml.cs
+++ b/src/Views/AddWorktree.axaml.cs
@ -23,7 +23,11 @@ namespace SourceGit.Views
            {
                var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options);
                if (selected.Count == 1)
-                    TxtLocation.Text = selected[0].Path.LocalPath;
+                {
+                    var folder = selected[0];
+                    var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
+                    TxtLocation.Text = folderPath;
+                }
            }
            catch (Exception exception)
            {
--- a/src/Views/ChangeCollectionView.axaml
+++ b/src/Views/ChangeCollectionView.axaml
@ -37,11 +37,11 @@
                                   SelectionChanged="OnRowSelectionChanged">
        <ListBox.ItemTemplate>
          <DataTemplate DataType="vm:ChangeTreeNode">
-            <Grid ColumnDefinitions="16,Auto,Auto,*"
+            <Grid ColumnDefinitions="16,Auto,Auto,Auto"
                  Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
                  Background="Transparent"
                  DoubleTapped="OnRowDoubleTapped"
-                  ToolTip.Tip="{Binding FullPath}">
+                  DataContextChanged="OnRowDataContextChanged">
              <v:ChangeTreeNodeToggleButton Grid.Column="0"
                                            Classes="tree_expander"
                                            Focusable="False"
@ -58,8 +58,16 @@
                            IsChecked="{Binding IsExpanded}"
                            IsVisible="{Binding IsFolder}"/>

-              <v:ChangeStatusIcon Grid.Column="1" Width="14" Height="14" IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}" Change="{Binding Change}" IsVisible="{Binding !IsFolder}"/>
-              <TextBlock Grid.Column="2" Classes="primary" Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}" Margin="6,0,0,0"/>
+              <v:ChangeStatusIcon Grid.Column="1"
+                                  Width="14" Height="14"
+                                  IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}"
+                                  Change="{Binding Change}"
+                                  IsVisible="{Binding !IsFolder}"/>
+
+              <StackPanel Grid.Column="3" Orientation="Horizontal" Margin="4,0,0,0">
+                <TextBlock Classes="primary" Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding ShowConflictMarker}"/>
+                <TextBlock Classes="primary" Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}"/>
+              </StackPanel>
            </Grid>
          </DataTemplate>
        </ListBox.ItemTemplate>
@ -77,17 +85,17 @@
            <Grid ColumnDefinitions="Auto,Auto,Auto,*"
                  Background="Transparent"
                  DoubleTapped="OnRowDoubleTapped"
-                  ToolTip.Tip="{Binding Path}">
+                  DataContextChanged="OnRowDataContextChanged">
              <v:ChangeStatusIcon Grid.Column="0"
                                  Width="14" Height="14"
                                  Margin="4,0,0,0"
                                  IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}"
                                  Change="{Binding}" />

-              <TextBlock Grid.Column="1"
-                         Classes="primary"
-                         Text="{Binding Path, Converter={x:Static c:PathConverters.PureFileName}}"
-                         Margin="4,0"/>
+              <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="4,0">
+                <TextBlock Classes="primary" Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding IsConflicted}"/>
+                <TextBlock Classes="primary" Text="{Binding Path, Converter={x:Static c:PathConverters.PureFileName}}"/>
+              </StackPanel>

              <TextBlock Grid.Column="2"
                         Classes="primary"
@ -110,17 +118,17 @@
            <Grid ColumnDefinitions="Auto,Auto,*"
                  Background="Transparent"
                  DoubleTapped="OnRowDoubleTapped"
-                  ToolTip.Tip="{Binding Path}">
+                  DataContextChanged="OnRowDataContextChanged">
              <v:ChangeStatusIcon Grid.Column="0"
                                  Width="14" Height="14"
                                  Margin="4,0,0,0"
                                  IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}"
                                  Change="{Binding}" />

-              <TextBlock Grid.Column="1"
-                         Classes="primary"
-                         Text="{Binding Path}"
-                         Margin="4,0"/>
+              <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="4,0">
+                <TextBlock Classes="primary" Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding IsConflicted}"/>
+                <TextBlock Classes="primary" Text="{Binding Path}"/>
+              </StackPanel>
            </Grid>
          </DataTemplate>
        </ListBox.ItemTemplate>
--- a/src/Views/ChangeCollectionView.axaml.cs
+++ b/src/Views/ChangeCollectionView.axaml.cs
@ -3,9 +3,11 @@ using System.Collections.Generic;

 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Documents;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Media;
 using Avalonia.VisualTree;

 namespace SourceGit.Views
@ -86,7 +88,7 @@ namespace SourceGit.Views
        }

        public static readonly StyledProperty<bool> AutoSelectFirstChangeProperty =
-            AvaloniaProperty.Register<ChangeCollectionView, bool>(nameof(AutoSelectFirstChange), false);
+            AvaloniaProperty.Register<ChangeCollectionView, bool>(nameof(AutoSelectFirstChange));

        public bool AutoSelectFirstChange
        {
@ -229,6 +231,28 @@ namespace SourceGit.Views
                UpdateSelection();
        }

+        private void OnRowDataContextChanged(object sender, EventArgs e)
+        {
+            if (sender is not Control control)
+                return;
+
+            if (control.DataContext is ViewModels.ChangeTreeNode node)
+            {
+                if (node.Change is { } c)
+                    UpdateRowTips(control, c);
+                else
+                    ToolTip.SetTip(control, node.FullPath);
+            }
+            else if (control.DataContext is Models.Change change)
+            {
+                UpdateRowTips(control, change);
+            }
+            else
+            {
+                ToolTip.SetTip(control, null);
+            }
+        }
+
        private void OnRowDoubleTapped(object sender, TappedEventArgs e)
        {
            var grid = sender as Grid;
@ -466,6 +490,21 @@ namespace SourceGit.Views
            }
        }

+        private void UpdateRowTips(Control control, Models.Change change)
+        {
+            var tip = new TextBlock() { TextWrapping = TextWrapping.Wrap };
+            tip.Inlines!.Add(new Run(change.Path));
+            tip.Inlines!.Add(new Run(" • ") { Foreground = Brushes.Gray });
+            tip.Inlines!.Add(new Run(IsUnstagedChange ? change.WorkTreeDesc : change.IndexDesc) { Foreground = Brushes.Gray });
+            if (change.IsConflicted)
+            {
+                tip.Inlines!.Add(new Run(" • ") { Foreground = Brushes.Gray });
+                tip.Inlines!.Add(new Run(change.ConflictDesc) { Foreground = Brushes.Gray });
+            }
+
+            ToolTip.SetTip(control, tip);
+        }
+
        private bool _disableSelectionChangingEvent = false;
    }
 }
--- a/src/Views/ChangeStatusIcon.cs
+++ b/src/Views/ChangeStatusIcon.cs
@ -9,6 +9,7 @@ namespace SourceGit.Views
 {
    public class ChangeStatusIcon : Control
    {
+        private static readonly string[] INDICATOR = ["?", "±", "T", "+", "−", "➜", "❏", "★", "!"];
        private static readonly IBrush[] BACKGROUNDS = [
            Brushes.Transparent,
            new LinearGradientBrush
@ -56,9 +57,6 @@ namespace SourceGit.Views
            Brushes.OrangeRed,
        ];

-        private static readonly string[] INDICATOR = ["?", "±", "T", "+", "−", "➜", "❏", "★", "!"];
-        private static readonly string[] TIPS = ["Unknown", "Modified", "Type Changed", "Added", "Deleted", "Renamed", "Copied", "Untracked", "Conflict"];
-
        public static readonly StyledProperty<bool> IsUnstagedChangeProperty =
            AvaloniaProperty.Register<ChangeStatusIcon, bool>(nameof(IsUnstagedChange));

@ -116,22 +114,7 @@ namespace SourceGit.Views
            base.OnPropertyChanged(change);

            if (change.Property == IsUnstagedChangeProperty || change.Property == ChangeProperty)
-            {
-                var isUnstaged = IsUnstagedChange;
-                var c = Change;
-                if (c == null)
-                {
-                    ToolTip.SetTip(this, null);
-                    return;
-                }
-
-                if (isUnstaged)
-                    ToolTip.SetTip(this, TIPS[(int)c.WorkTree]);
-                else
-                    ToolTip.SetTip(this, TIPS[(int)c.Index]);
-
                InvalidateVisual();
-            }
        }
    }
 }
--- a/src/Views/Clone.axaml.cs
+++ b/src/Views/Clone.axaml.cs
@ -23,7 +23,11 @@ namespace SourceGit.Views
            {
                var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options);
                if (selected.Count == 1)
-                    TxtParentFolder.Text = selected[0].Path.LocalPath;
+                {
+                    var folder = selected[0];
+                    var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
+                    TxtParentFolder.Text = folderPath;
+                }
            }
            catch (Exception exception)
            {
--- a/src/Views/ConfigureWorkspace.axaml.cs
+++ b/src/Views/ConfigureWorkspace.axaml.cs
@ -32,7 +32,9 @@ namespace SourceGit.Views
                var selected = await StorageProvider.OpenFolderPickerAsync(options);
                if (selected.Count == 1)
                {
-                    workspace.Selected.DefaultCloneDir = selected[0].Path.LocalPath;
+                    var folder = selected[0];
+                    var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
+                    workspace.Selected.DefaultCloneDir = folderPath;
                }
            }
            catch (Exception ex)
--- a/src/Views/Conflict.axaml
+++ b/src/Views/Conflict.axaml
@ -15,6 +15,14 @@
        <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
        <TextBlock Margin="0,16" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
        
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,8">
+          <Border Height="16" VerticalAlignment="Center" Background="Red" CornerRadius="8">
+            <TextBlock Classes="primary" Text="{Binding Marker}" Foreground="White" FontWeight="Bold" Margin="8,0" FontSize="10"/>
+          </Border>
+          
+          <TextBlock Margin="8,0,0,0" VerticalAlignment="Center" Text="{Binding Description}"/>
+        </StackPanel>
+        
        <Border Margin="16,0" Padding="8" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
          <Border.DataTemplates>
            <DataTemplate DataType="vm:ConflictSourceBranch">
@ -97,27 +105,27 @@
          </Border.IsVisible>

          <Grid Margin="8,0,0,0" RowDefinitions="32,32" ColumnDefinitions="Auto,*">
-            <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="THEIRS"/>
-            <ContentControl Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Theirs}"/>
-            <TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="MINE"/>
-            <ContentControl Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Mine}"/>
+            <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="MINE"/>
+            <ContentControl Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Mine}"/>
+            <TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="THEIRS"/>
+            <ContentControl Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Theirs}"/>
          </Grid>
        </Border>

        <StackPanel Margin="0,8,0,0"  Orientation="Horizontal" HorizontalAlignment="Center">
-          <Button Classes="flat" Margin="0,0,0,0" Command="{Binding UseTheirs}" ToolTip.Tip="git checkout --theirs">
+          <Button Classes="flat" Margin="0,0,0,0" Command="{Binding UseTheirs}">
            <StackPanel Orientation="Horizontal">
              <Path Width="12" Height="12" Data="{StaticResource Icons.Incoming}"/>
              <TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseTheirs}" VerticalAlignment="Center"/>
            </StackPanel>
          </Button>
-          <Button Classes="flat" Margin="8,0,0,0" Command="{Binding UseMine}" ToolTip.Tip="git checkout --ours">
+          <Button Classes="flat" Margin="8,0,0,0" Command="{Binding UseMine}">
            <StackPanel Orientation="Horizontal">
              <Path Width="12" Height="12" Data="{StaticResource Icons.Local}"/>
              <TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseMine}" VerticalAlignment="Center"/>
            </StackPanel>
          </Button>
-          <Button Classes="flat" Margin="8,0,0,0" Command="{Binding OpenExternalMergeTool}">
+          <Button Classes="flat" Margin="8,0,0,0" Command="{Binding OpenExternalMergeTool}" IsVisible="{Binding CanUseExternalMergeTool}">
            <StackPanel Orientation="Horizontal">
              <Path Width="12" Height="12" Data="{StaticResource Icons.OpenWith}"/>
              <TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.OpenExternalMergeTool}" VerticalAlignment="Center"/>
--- a/src/Views/Preferences.axaml.cs
+++ b/src/Views/Preferences.axaml.cs
@ -250,7 +250,9 @@ namespace SourceGit.Views
                var selected = await StorageProvider.OpenFolderPickerAsync(options);
                if (selected.Count == 1)
                {
-                    ViewModels.Preferences.Instance.GitDefaultCloneDir = selected[0].Path.LocalPath;
+                    var folder = selected[0];
+                    var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
+                    ViewModels.Preferences.Instance.GitDefaultCloneDir = folderPath;
                }
            }
            catch (Exception ex)
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@ -129,7 +129,7 @@
              </ListBoxItem>

              <ListBoxItem IsVisible="{Binding !IsBare}">
-                <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto">
+                <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
                  <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Changes}"/>
                  <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.WorkingCopy}"/>
                  <v:CounterPresenter Grid.Column="2"
@ -146,11 +146,18 @@
                        Data="{StaticResource Icons.Info}"
                        Fill="DarkOrange"
                        IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+                  <Button Grid.Column="4"
+                          Classes="icon_button"
+                          Width="26" Height="26"
+                          Command="{Binding DiscardAllChanges}"
+                          ToolTip.Tip="{DynamicResource Text.Repository.DiscardAll}">
+                    <Path Width="12" Height="12" Data="{StaticResource Icons.Undo}"/>
+                  </Button>
                </Grid>
              </ListBoxItem>

              <ListBoxItem IsVisible="{Binding !IsBare}">
-                <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto">
+                <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto">
                  <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Stashes}"/>
                  <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Stashes}"/>
                  <v:CounterPresenter Grid.Column="2"
@ -161,6 +168,14 @@
                                      FontSize="10"
                                      Foreground="{DynamicResource Brush.BadgeFG}"
                                      Background="{DynamicResource Brush.Badge}"/>
+                  <Button Grid.Column="3"
+                          Classes="icon_button"
+                          Width="26" Height="26"
+                          Command="{Binding ClearStashes}"
+                          IsEnabled="{Binding StashesCount, Converter={x:Static c:IntConverters.IsGreaterThanZero}}"
+                          ToolTip.Tip="{DynamicResource Text.Repository.ClearStashes}">
+                    <Path Width="12" Height="12" Data="{StaticResource Icons.RemoveAll}"/>
+                  </Button>
                </Grid>
              </ListBoxItem>
            </ListBox>
--- a/src/Views/StashesPage.axaml
+++ b/src/Views/StashesPage.axaml
@ -19,20 +19,12 @@
    <!-- Left -->
    <Grid Grid.Column="0" RowDefinitions="28,36,*,28,*">
      <!-- Stash Bar -->
-      <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto">
+      <Grid Grid.Row="0" ColumnDefinitions="Auto,*">
        <Path Grid.Column="0" Margin="8,0,0,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Stashes}"/>
        <TextBlock Grid.Column="1" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0">
          <Run Text="{DynamicResource Text.Stashes.Stashes}"/>
          <Run Text="{Binding Stashes, Converter={x:Static c:ListConverters.ToCount}, Mode=OneWay}"/>
        </TextBlock>
-        <Button Grid.Column="2"
-                Classes="icon_button"
-                Width="26" Height="14"
-                Padding="0"
-                Command="{Binding Clear}"
-                IsEnabled="{Binding Stashes.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.RemoveAll}"/>
-        </Button>
      </Grid>

      <!-- Search Bar -->
--- a/src/Views/Statistics.axaml
+++ b/src/Views/Statistics.axaml
@ -162,7 +162,9 @@

                <ListBox.ItemTemplate>
                  <DataTemplate DataType="m:StatisticsAuthor">
-                    <Border BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}">
+                    <Border BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
+                            Background="Transparent"
+                            ToolTip.Tip="{Binding User}">
                      <Grid ColumnDefinitions="26,*,100">
                        <v:Avatar Grid.Column="0"
                                  Width="16" Height="16"
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@ -1748,8 +1748,8 @@ namespace SourceGit.Views
                    return;
                }

-                var top = chunk.Y + (chunk.Height >= 36 ? 16 : 4);
-                var right = (chunk.Combined || !chunk.IsOldSide) ? 16 : (v.Bounds.Width * 0.5f) + 16;
+                var top = chunk.Y + (chunk.Height >= 36 ? 8 : 2);
+                var right = (chunk.Combined || !chunk.IsOldSide) ? 26 : (v.Bounds.Width * 0.5f) + 26;
                v.Popup.Margin = new Thickness(0, top, right, 0);
                v.Popup.IsVisible = true;
            });
@ -1868,7 +1868,7 @@ namespace SourceGit.Views

            if (!selection.HasLeftChanges)
            {
-                new Commands.Add(repo.FullPath, [change.Path]).Exec();
+                new Commands.Add(repo.FullPath, change).Exec();
            }
            else
            {
@ -1929,7 +1929,7 @@ namespace SourceGit.Views
                if (change.DataForAmend != null)
                    new Commands.UnstageChangesForAmend(repo.FullPath, [change]).Exec();
                else
-                    new Commands.Reset(repo.FullPath, [change]).Exec();
+                    new Commands.Restore(repo.FullPath, change).Exec();
            }
            else
            {
--- a/src/Views/WelcomeToolbar.axaml.cs
+++ b/src/Views/WelcomeToolbar.axaml.cs
@ -35,7 +35,11 @@ namespace SourceGit.Views
            {
                var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options);
                if (selected.Count == 1)
-                    ViewModels.Welcome.Instance.OpenOrInitRepository(selected[0].Path.LocalPath, null, false);
+                {
+                    var folder = selected[0];
+                    var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
+                    ViewModels.Welcome.Instance.OpenOrInitRepository(folderPath, null, false);
+                }
            }
            catch (Exception exception)
            {
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@ -235,7 +235,7 @@
      <v:CommitMessageTextBox Grid.Row="2" ShowAdvancedOptions="True" Text="{Binding CommitMessage, Mode=TwoWay}"/>

      <!-- Commit Options -->
-      <Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,*,Auto,Auto,Auto">
+      <Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,Auto,*,Auto,Auto,Auto">
        <CheckBox Grid.Column="0"
                  Height="24"
                  Margin="1,0,0,0"
@ -256,12 +256,23 @@
                  ToolTip.Placement="Top"
                  ToolTip.VerticalOffset="0"/>

-        <v:LoadingIcon Grid.Column="2"
+        <CheckBox Grid.Column="2"
+                  Height="24"
+                  Margin="12,0,0,0"
+                  HorizontalAlignment="Left"
+                  IsChecked="{Binding ResetAuthor, Mode=TwoWay}"
+                  IsVisible="{Binding UseAmend}"
+                  Content="{DynamicResource Text.WorkingCopy.ResetAuthor}"
+                  ToolTip.Tip="--reset-author"
+                  ToolTip.Placement="Top"
+                  ToolTip.VerticalOffset="0"/>
+
+        <v:LoadingIcon Grid.Column="3"
                       Width="18" Height="18"
                       HorizontalAlignment="Right"
                       IsVisible="{Binding IsCommitting}"/>

-        <SplitButton Grid.Column="3"
+        <SplitButton Grid.Column="4"
                     Content="{DynamicResource Text.Repository.Continue}"
                     Height="28"
                     Margin="8,0,0,0"
@ -283,7 +294,7 @@
          </SplitButton.Flyout>
        </SplitButton>

-        <Button Grid.Column="3"
+        <Button Grid.Column="4"
                Classes="flat primary"
                Content="{DynamicResource Text.WorkingCopy.Commit}"
                Height="28"
@ -316,7 +327,7 @@
        </Button>

        <!-- Invisible button just to add another hotkey `Ctrl+Shift+Enter` to commit with auto-stage -->
-        <Button Grid.Column="4"
+        <Button Grid.Column="5"
                Width="0" Height="0"
                Background="Transparent"
                Command="{Binding CommitWithAutoStage}"
@ -329,7 +340,7 @@
          </Button.IsEnabled>
        </Button>

-        <Button Grid.Column="5"
+        <Button Grid.Column="6"
                Classes="flat"
                Content="{DynamicResource Text.WorkingCopy.CommitAndPush}"
                Height="28"
 @ -1 +1 @@
 .19
 .20