Merge branch 'release/v8.35'

2024-10-31 13:03:20 -07:00 · 2024-10-21 09:15:03 +08:00 · 2024-10-21 09:15:03 +08:00 · 0bb502c7cf
commit 0bb502c7cf
parent efc14fed36 f633c5260e
74 changed files with 1066 additions and 369 deletions
--- a/README.md
+++ b/README.md
@ -81,7 +81,6 @@ For **macOS** users:
 * Make sure your mac trusts all software from anywhere. For more information, search `spctl --master-disable`.
 * Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your mac.
 * You may need to run `sudo xattr -cr /Applications/SourceGit.app` to make sure the software works.
-* You may need to start this app from commandline by using `open -a SourceGit` to introduce the `PATH` environment variable from your shell.

 For **Linux** users:

--- a/2
+++ b/2
@ -1 +1 @@
-8.34
+8.35
--- a/screenshots/theme_dark.png
+++ b/screenshots/theme_dark.png
--- a/screenshots/theme_light.png
+++ b/screenshots/theme_light.png
--- a/src/Commands/Add.cs
+++ b/src/Commands/Add.cs
@ -5,27 +5,27 @@ namespace SourceGit.Commands
 {
    public class Add : Command
    {
-        public Add(string repo, List<Models.Change> changes = null)
+        public Add(string repo, bool includeUntracked)
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+            Args = includeUntracked ? "add ." : "add -u .";
+        }
+        
+        public Add(string repo, List<Models.Change> changes)
        {
            WorkingDirectory = repo;
            Context = repo;

-            if (changes == null || changes.Count == 0)
+            var builder = new StringBuilder();
+            builder.Append("add --");
+            foreach (var c in changes)
            {
-                Args = "add .";
-            }
-            else
-            {
-                var builder = new StringBuilder();
-                builder.Append("add --");
-                foreach (var c in changes)
-                {
-                    builder.Append(" \"");
-                    builder.Append(c.Path);
-                    builder.Append("\"");
-                }
-                Args = builder.ToString();
+                builder.Append(" \"");
+                builder.Append(c.Path);
+                builder.Append("\"");
            }
+            Args = builder.ToString();
        }
    }
 }
--- a/src/Commands/CherryPick.cs
+++ b/src/Commands/CherryPick.cs
@ -2,12 +2,19 @@
 {
    public class CherryPick : Command
    {
-        public CherryPick(string repo, string commits, bool noCommit)
+        public CherryPick(string repo, string commits, bool noCommit, bool appendSourceToMessage, string extraParams)
        {
-            var mode = noCommit ? "-n" : "--ff";
            WorkingDirectory = repo;
            Context = repo;
-            Args = $"cherry-pick {mode} {commits}";
+
+            Args = "cherry-pick ";
+            if (noCommit)
+                Args += "-n ";
+            if (appendSourceToMessage)
+                Args += "-x ";
+            if (!string.IsNullOrEmpty(extraParams))
+                Args += $"{extraParams} ";
+            Args += commits;
        }
    }
 }
--- a/src/Commands/Command.cs
+++ b/src/Commands/Command.cs
@ -195,15 +195,6 @@ namespace SourceGit.Commands
            if (OperatingSystem.IsLinux())
                start.Environment.Add("LANG", "en_US.UTF-8");

-            // Fix sometimes `LSEnvironment` not working on macOS
-            if (OperatingSystem.IsMacOS())
-            {
-                if (start.Environment.TryGetValue("PATH", out var path))
-                    start.Environment.Add("PATH", $"/opt/homebrew/bin:/opt/homebrew/sbin:{path}");
-                else
-                    start.Environment.Add("PATH", "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin");
-            }
-
            // Force using this app as git editor.
            switch (Editor)
            {
--- a/src/Commands/Diff.cs
+++ b/src/Commands/Diff.cs
@ -24,9 +24,9 @@ namespace SourceGit.Commands
            Context = repo;

            if (ignoreWhitespace)
-                Args = $"diff --ignore-cr-at-eol --ignore-all-space --unified={unified} {opt}";
+                Args = $"diff --patch --ignore-cr-at-eol --ignore-all-space --unified={unified} {opt}";
            else
-                Args = $"diff --ignore-cr-at-eol --unified={unified} {opt}";
+                Args = $"diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
        }

        public Models.DiffResult Result()
--- a/src/Commands/GC.cs
+++ b/src/Commands/GC.cs
@ -10,7 +10,7 @@ namespace SourceGit.Commands
            WorkingDirectory = repo;
            Context = repo;
            TraitErrorAsOutput = true;
-            Args = "gc --prune";
+            Args = "gc --prune=now";
        }

        protected override void OnReadline(string line)
--- a/src/Commands/QueryBranches.cs
+++ b/src/Commands/QueryBranches.cs
@ -14,7 +14,7 @@ namespace SourceGit.Commands
        {
            WorkingDirectory = repo;
            Context = repo;
-            Args = "branch -l --all -v --format=\"%(refname)$%(objectname)$%(HEAD)$%(upstream)$%(upstream:trackshort)\"";
+            Args = "branch -l --all -v --format=\"%(refname)%00%(objectname)%00%(HEAD)%00%(upstream)%00%(upstream:trackshort)\"";
        }

        public List<Models.Branch> Result()
@ -37,7 +37,7 @@ namespace SourceGit.Commands

        private Models.Branch ParseLine(string line)
        {
-            var parts = line.Split('$');
+            var parts = line.Split('\0');
            if (parts.Length != 5)
                return null;

--- a/src/Commands/QueryTags.cs
+++ b/src/Commands/QueryTags.cs
@ -7,9 +7,11 @@ namespace SourceGit.Commands
    {
        public QueryTags(string repo)
        {
+            _boundary = $"----- BOUNDARY OF TAGS {Guid.NewGuid()} -----";
+
            Context = repo;
            WorkingDirectory = repo;
-            Args = "tag -l --sort=-creatordate --format=\"$%(refname)$%(objectname)$%(*objectname)\"";
+            Args = $"tag -l --sort=-creatordate --format=\"{_boundary}%(refname)%00%(objectname)%00%(*objectname)%00%(contents:subject)%0a%0a%(contents:body)\"";
        }

        public List<Models.Tag> Result()
@ -19,38 +21,25 @@ namespace SourceGit.Commands
            if (!rs.IsSuccess)
                return tags;

-            var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
-            foreach (var line in lines)
+            var records = rs.StdOut.Split(_boundary, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var record in records)
            {
-                var tag = ParseLine(line);
-                if (tag != null)
-                    tags.Add(tag);
+                var subs = record.Split('\0', StringSplitOptions.None);
+                if (subs.Length != 4)
+                    continue;
+
+                var message = subs[3].Trim();
+                tags.Add(new Models.Tag()
+                {
+                    Name = subs[0].Substring(10),
+                    SHA = string.IsNullOrEmpty(subs[2]) ? subs[1] : subs[2],
+                    Message = string.IsNullOrEmpty(message) ? null : message,
+                });
            }

            return tags;
        }

-        private Models.Tag ParseLine(string line)
-        {
-            var subs = line.Split('$', StringSplitOptions.RemoveEmptyEntries);
-            if (subs.Length == 2)
-            {
-                return new Models.Tag()
-                {
-                    Name = subs[0].Substring(10),
-                    SHA = subs[1],
-                };
-            }
-            else if (subs.Length == 3)
-            {
-                return new Models.Tag()
-                {
-                    Name = subs[0].Substring(10),
-                    SHA = subs[2],
-                };
-            }
-
-            return null;
-        }
+        private string _boundary = string.Empty;
    }
 }
--- a/src/Commands/Stash.cs
+++ b/src/Commands/Stash.cs
@ -25,7 +25,7 @@ namespace SourceGit.Commands
            {
                foreach (var c in changes)
                    pathsBuilder.Append($"\"{c.Path}\" ");
-                
+
                var paths = pathsBuilder.ToString();
                Args = $"stash push --staged -m \"{message}\" -- {paths}";
            }
@ -51,11 +51,11 @@ namespace SourceGit.Commands
                    new Add(WorkingDirectory, needAdd).Exec();
                    needAdd.Clear();
                }
-                
+
                var paths = pathsBuilder.ToString();
                Args = $"stash push -m \"{message}\" -- {paths}";
            }
-            
+
            return Exec();
        }

--- a/src/Models/Commit.cs
+++ b/src/Models/Commit.cs
@ -31,18 +31,19 @@ namespace SourceGit.Models
        public List<Decorator> Decorators { get; set; } = new List<Decorator>();
        public bool HasDecorators => Decorators.Count > 0;

-        public bool IsMerged { get; set; } = false;
-        public Thickness Margin { get; set; } = new Thickness(0);
-
        public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
        public string CommitterTimeStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
        public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString("yyyy/MM/dd");

+        public bool IsMerged { get; set; } = false;
        public bool IsCommitterVisible => !Author.Equals(Committer) || AuthorTime != CommitterTime;
        public bool IsCurrentHead => Decorators.Find(x => x.Type is DecoratorType.CurrentBranchHead or DecoratorType.CurrentCommitHead) != null;

+        public int Color { get; set; } = 0;
        public double Opacity => IsMerged ? 1 : OpacityForNotMerged;
        public FontWeight FontWeight => IsCurrentHead ? FontWeight.Bold : FontWeight.Regular;
+        public Thickness Margin { get; set; } = new Thickness(0);
+        public IBrush Brush => CommitGraph.Pens[Color].Brush;

        public void ParseDecorators(string data)
        {
--- a/src/Models/CommitGraph.cs
+++ b/src/Models/CommitGraph.cs
@ -186,6 +186,7 @@ namespace SourceGit.Models
                // Margins & merge state (used by Views.Histories).
                commit.IsMerged = isMerged;
                commit.Margin = new Thickness(Math.Max(offsetX, maxOffsetOld) + halfWidth + 2, 0, 0, 0);
+                commit.Color = dotColor;
            }

            // Deal with curves haven't ended yet.
@ -326,14 +327,15 @@ namespace SourceGit.Models
        private static readonly List<Color> s_defaultPenColors = [
            Colors.Orange,
            Colors.ForestGreen,
-            Colors.Gold,
-            Colors.Magenta,
-            Colors.Red,
            Colors.Gray,
            Colors.Turquoise,
            Colors.Olive,
+            Colors.Magenta,
+            Colors.Red,
            Colors.Khaki,
            Colors.Lime,
+            Colors.RoyalBlue,
+            Colors.Teal,
        ];
    }
 }
--- a/src/Models/CommitTemplate.cs
+++ b/src/Models/CommitTemplate.cs
@ -55,7 +55,7 @@ namespace SourceGit.Models
                {
                    var count = Math.Min(int.Parse(countStr.Substring(1)), changes.Count);
                    for (int j = 0; j < count; j++)
-                        paths.Add(changes[i].Path);
+                        paths.Add(changes[j].Path);

                    if (count < changes.Count)
                        more = $" and {changes.Count - count} other files";
--- a/src/Models/ConventionalCommitType.cs
+++ b/src/Models/ConventionalCommitType.cs
@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace SourceGit.Models
+{
+    public class ConventionalCommitType
+    {
+        public string Type { get; set; } = string.Empty;
+        public string Description { get; set; } = string.Empty;
+
+        public static readonly List<ConventionalCommitType> Supported = new List<ConventionalCommitType>()
+        {
+            new ConventionalCommitType("feat", "Adding a new feature"),
+            new ConventionalCommitType("fix", "Fixing a bug"),
+            new ConventionalCommitType("docs", "Updating documentation"),
+            new ConventionalCommitType("style", "Elements or code styles without changing the code logic"),
+            new ConventionalCommitType("test", "Adding or updating tests"),
+            new ConventionalCommitType("chore", "Making changes to the build process or auxiliary tools and libraries"),
+            new ConventionalCommitType("revert", "Undoing a previous commit"),
+            new ConventionalCommitType("refactor", "Restructuring code without changing its external behavior")
+        };
+
+        public ConventionalCommitType(string type, string description)
+        {
+            Type = type;
+            Description = description;
+        }
+    }
+}
--- a/src/Models/Remote.cs
+++ b/src/Models/Remote.cs
@ -5,9 +5,9 @@ namespace SourceGit.Models
 {
    public partial class Remote
    {
-        [GeneratedRegex(@"^http[s]?://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-/~]+/[\w\-\.]+(\.git)?$")]
+        [GeneratedRegex(@"^http[s]?://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-/~%]+/[\w\-\.%]+(\.git)?$")]
        private static partial Regex REG_HTTPS();
-        [GeneratedRegex(@"^[\w\-]+@[\w\.\-]+(\:[0-9]+)?:[\w\-/~]+/[\w\-\.]+(\.git)?$")]
+        [GeneratedRegex(@"^[\w\-]+@[\w\.\-]+(\:[0-9]+)?:[\w\-/~%]+/[\w\-\.%]+(\.git)?$")]
        private static partial Regex REG_SSH1();
        [GeneratedRegex(@"^ssh://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-/~]+/[\w\-\.]+(\.git)?$")]
        private static partial Regex REG_SSH2();
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@ -9,7 +9,7 @@ namespace SourceGit.Models
            get;
            set;
        } = string.Empty;
-        
+
        public DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch
        {
            get;
--- a/src/Models/Tag.cs
+++ b/src/Models/Tag.cs
@ -4,6 +4,7 @@
    {
        public string Name { get; set; }
        public string SHA { get; set; }
+        public string Message { get; set; }
        public bool IsFiltered { get; set; }
    }
 }
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.Versioning;
+using System.Text;

 using Avalonia;

@ -17,6 +18,31 @@ namespace SourceGit.Native
            {
                DisableDefaultApplicationMenuItems = true,
            });
+
+            {
+                var startInfo = new ProcessStartInfo();
+                startInfo.FileName = "zsh";
+                startInfo.Arguments = "--login -c \"echo $PATH\"";
+                startInfo.UseShellExecute = false;
+                startInfo.CreateNoWindow = true;
+                startInfo.RedirectStandardOutput = true;
+                startInfo.StandardOutputEncoding = Encoding.UTF8;
+
+                try
+                {
+                    var proc = new Process() { StartInfo = startInfo };
+                    proc.Start();
+                    var pathData = proc.StandardOutput.ReadToEnd();
+                    proc.WaitForExit();
+                    if (proc.ExitCode == 0)
+                        Environment.SetEnvironmentVariable("PATH", pathData);
+                    proc.Close();
+                }
+                catch
+                {
+                    // Ignore error.
+                }
+            }
        }

        public string FindGitExecutable()
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@ -16,6 +16,7 @@
  <StreamGeometry x:Key="Icons.Code">M853 102H171C133 102 102 133 102 171v683C102 891 133 922 171 922h683C891 922 922 891 922 853V171C922 133 891 102 853 102zM390 600l-48 48L205 512l137-137 48 48L301 512l88 88zM465 819l-66-18L559 205l66 18L465 819zm218-171L634 600 723 512l-88-88 48-48L819 512 683 649z</StreamGeometry>
  <StreamGeometry x:Key="Icons.ColorPicker">M128 854h768v86H128zM390 797c13 13 29 19 48 19s35-6 45-19l291-288c26-22 26-64 0-90L435 83l-61 61L426 192l-272 269c-22 22-22 64 0 90l237 246zm93-544 211 211-32 32H240l243-243zM707 694c0 48 38 86 86 86 48 0 86-38 86-86 0-22-10-45-26-61L794 576l-61 61c-13 13-26 35-26 58z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Commit">M796 471A292 292 0 00512 256a293 293 0 00-284 215H0v144h228A293 293 0 00512 832a291 291 0 00284-217H1024V471h-228M512 688A146 146 0 01366 544A145 145 0 01512 400c80 0 146 63 146 144A146 146 0 01512 688</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CommitMessageGenerator">M796 561a5 5 0 014 7l-39 90a5 5 0 004 7h100a5 5 0 014 8l-178 247a5 5 0 01-9-4l32-148a5 5 0 00-5-6h-89a5 5 0 01-4-7l86-191a5 5 0 014-3h88zM731 122a73 73 0 0173 73v318a54 54 0 00-8-1H731V195H244v634h408l-16 73H244a73 73 0 01-73-73V195a73 73 0 0173-73h488zm-219 366v73h-195v-73h195zm146-146v73H317v-73h341z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Compare">M645 448l64 64 220-221L704 64l-64 64 115 115H128v90h628zM375 576l-64-64-220 224L314 960l64-64-116-115H896v-90H262z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Conflict">M608 0q48 0 88 23t63 63 23 87v70h55q35 0 67 14t57 38 38 57 14 67V831q0 34-14 66t-38 57-57 38-67 13H426q-34 0-66-13t-57-38-38-57-14-66v-70h-56q-34 0-66-14t-57-38-38-57-13-67V174q0-47 23-87T109 23 196 0h412m175 244H426q-46 0-86 22T278 328t-26 85v348H608q47 0 86-22t63-62 25-85l1-348m-269 318q18 0 31 13t13 31-13 31-31 13-31-13-13-31 13-31 31-13m0-212q13 0 22 9t11 22v125q0 14-9 23t-22 10-23-7-11-22l-1-126q0-13 10-23t23-10z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Copy">M896 811l-128 0c-23 0-43-19-43-43 0-23 19-43 43-43l107 0c13 0 21-9 21-21L896 107c0-13-9-21-21-21L448 85c-13 0-21 9-21 21l0 21c0 23-19 43-43 43-23 0-43-19-43-43L341 85c0-47 38-85 85-85l469 0c47 0 85 38 85 85l0 640C981 772 943 811 896 811zM683 299l0 640c0 47-38 85-85 85L128 1024c-47 0-85-38-85-85L43 299c0-47 38-85 85-85l469 0C644 213 683 252 683 299zM576 299 149 299c-13 0-21 9-21 21l0 597c0 13 9 21 21 21l427 0c13 0 21-9 21-21L597 320C597 307 589 299 576 299z</StreamGeometry>
@ -50,6 +51,7 @@
  <StreamGeometry x:Key="Icons.GitFlow.Release">M884 159l-18-18a43 43 0 00-38-12l-235 43a166 166 0 00-101 60L400 349a128 128 0 00-148 47l-120 171a21 21 0 005 29l17 12a128 128 0 00178-32l27-38 124 124-38 27a128 128 0 00-32 178l12 17a21 21 0 0029 5l171-120a128 128 0 0047-148l117-92A166 166 0 00853 431l43-235a43 43 0 00-12-38zm-177 249a64 64 0 110-90 64 64 0 010 90zm-373 312a21 21 0 010 30l-139 139a21 21 0 01-30 0l-30-30a21 21 0 010-30l139-139a21 21 0 0130 0z</StreamGeometry>
  <StreamGeometry x:Key="Icons.GitIgnore">M590 74 859 342V876c0 38-31 68-68 68H233c-38 0-68-31-68-68V142c0-38 31-68 68-68h357zm-12 28H233a40 40 0 00-40 38L193 142v734a40 40 0 0038 40L233 916h558a40 40 0 0040-38L831 876V354L578 102zM855 371h-215c-46 0-83-36-84-82l0-2V74h28v213c0 30 24 54 54 55l2 0h215v28zM57 489m28 0 853 0q28 0 28 28l0 284q0 28-28 28l-853 0q-28 0-28-28l0-284q0-28 28-28ZM157 717c15 0 29-6 37-13v-51h-41v22h17v18c-2 2-6 3-10 3-21 0-30-13-30-34 0-21 12-34 28-34 9 0 15 4 20 9l14-17C184 610 172 603 156 603c-29 0-54 21-54 57 0 37 24 56 54 56zM245 711v-108h-34v108h34zm69 0v-86H341V603H262v22h28V711h24zM393 711v-108h-34v108h34zm66 6c15 0 29-6 37-13v-51h-41v22h17v18c-2 2-6 3-10 3-21 0-30-13-30-34 0-21 12-34 28-34 9 0 15 4 20 9l14-17C485 610 474 603 458 603c-29 0-54 21-54 57 0 37 24 56 54 56zm88-6v-36c0-13-2-28-3-40h1l10 24 25 52H603v-108h-23v36c0 13 2 28 3 40h-1l-10-24L548 603H523v108h23zM677 717c30 0 51-22 51-57 0-36-21-56-51-56-30 0-51 20-51 56 0 36 21 57 51 57zm3-23c-16 0-26-12-26-32 0-19 10-31 26-31 16 0 26 11 26 31S696 694 680 694zm93 17v-38h13l21 38H836l-25-43c12-5 19-15 19-31 0-26-20-34-44-34H745v108h27zm16-51H774v-34h15c16 0 25 4 25 16s-9 18-25 18zM922 711v-22h-43v-23h35v-22h-35V625h41V603H853v108h68z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Grid">M30 271l241 0 0-241-241 0 0 241zM392 271l241 0 0-241-241 0 0 241zM753 30l0 241 241 0 0-241-241 0zM30 632l241 0 0-241-241 0 0 241zM392 632l241 0 0-241-241 0 0 241zM753 632l241 0 0-241-241 0 0 241zM30 994l241 0 0-241-241 0 0 241zM392 994l241 0 0-241-241 0 0 241zM753 994l241 0 0-241-241 0 0 241z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Head">M0 512M1024 512M512 0M512 1024M955 323q0 23-16 39l-414 414-78 78q-16 16-39 16t-39-16l-78-78-207-207q-16-16-16-39t16-39l78-78q16-16 39-16t39 16l168 169 375-375q16-16 39-16t39 16l78 78q16 16 16 39z</StreamGeometry>
  <StreamGeometry x:Key="Icons.HiddenSymbol">M416 64H768v64h-64v704h64v64H448v-64h64V512H416a224 224 0 1 1 0-448zM576 832h64V128H576v704zM416 128H512v320H416a160 160 0 0 1 0-320z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Histories">M24 512A488 488 0 01512 24A488 488 0 011000 512A488 488 0 01512 1000A488 488 0 0124 512zm447-325v327L243 619l51 111 300-138V187H471z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Home">M832 64h128v278l-128-146V64zm64 448L512 73 128 512H0L448 0h128l448 512h-128zm0 83V1024H640V704c0-35-29-64-64-64h-128a64 64 0 00-64 64v320H128V595l384-424 384 424z</StreamGeometry>
@ -84,8 +86,9 @@
  <StreamGeometry x:Key="Icons.Pull">M432 0h160c27 0 48 21 48 48v336h175c36 0 53 43 28 68L539 757c-15 15-40 15-55 0L180 452c-25-25-7-68 28-68H384V48c0-27 21-48 48-48zm592 752v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h293l98 98c40 40 105 40 145 0l98-98H976c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Push">M592 768h-160c-27 0-48-21-48-48V384h-175c-36 0-53-43-28-68L485 11c15-15 40-15 55 0l304 304c25 25 7 68-28 68H640v336c0 27-21 48-48 48zm432-16v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h272v16c0 62 50 112 112 112h160c62 0 112-50 112-112v-16h272c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Rebase">M277 85a149 149 0 00-43 292v230a32 32 0 0064 0V555h267A160 160 0 00725 395v-12a149 149 0 10-64-5v17a96 96 0 01-96 96H299V383A149 149 0 00277 85zM228 720a32 32 0 00-37-52 150 150 0 00-53 68 32 32 0 1060 23 85 85 0 0130-39zm136-52a32 32 0 00-37 52 86 86 0 0130 39 32 32 0 1060-23 149 149 0 00-53-68zM204 833a32 32 0 10-55 32 149 149 0 0063 58 32 32 0 0028-57 85 85 0 01-36-33zm202 32a32 32 0 00-55-32 85 85 0 01-36 33 32 32 0 0028 57 149 149 0 0063-58z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Reference">M854 234a171 171 0 00-171 171v51c13-5 28-7 43-7h35a136 136 0 01136 136v93a198 198 0 01-198 198 101 101 0 01-101-101V405a256 256 0 01256-256h21a21 21 0 0121 21v43a21 21 0 01-21 21h-21zM213 456c13-5 28-7 43-7h35a136 136 0 01136 136v93a198 198 0 01-198 198 101 101 0 01-101-101V405a256 256 0 01256-256h21a21 21 0 0121 21v43a21 21 0 01-21 21h-21a171 171 0 00-171 171v51z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Relation">m224 154a166 166 0 00-166 166v192a166 166 0 00166 166h64v-76h-64a90 90 0 01-90-90v-192a90 90 0 0190-90h320a90 90 0 0190 90v192a90 90 0 01-90 90h-128v77h128a166 166 0 00166-167v-192a166 166 0 00-166-166h-320zm166 390a90 90 0 0190-90h128v-76h-128a166 166 0 00-166 166v192a166 166 0 00166 166h320a166 166 0 00166-166v-192a166 166 0 00-166-166h-64v77h64a90 90 0 0190 90v192a90 90 0 01-90 90h-320a90 90 0 01-90-90v-192z</StreamGeometry>
-  <StreamGeometry x:Key="Icons.Remote">M706 302a289 289 0 00-173 44 27 27 0 1029 46 234 234 0 01125-36c23 0 45 3 66 9 93 28 161 114 161 215C914 704 813 805 687 805H337C211 805 110 704 110 580c0-96 61-178 147-210C282 263 379 183 495 183a245 245 0 01210 119z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Remote">M512 128M706 302a289 289 0 00-173 44 27 27 0 1029 46 234 234 0 01125-36c23 0 45 3 66 9 93 28 161 114 161 215C914 704 813 805 687 805H337C211 805 110 704 110 580c0-96 61-178 147-210C282 263 379 183 495 183a245 245 0 01210 119z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Remote.Add">M364 512h67v108h108v67h-108v108h-67v-108h-108v-67h108v-108zm298-64A107 107 0 01768 555C768 614 720 660 660 660h-108v-54h-108v-108h-94v108h-94c4-21 22-47 44-51l-1-12a75 75 0 0171-75a128 128 0 01239-7a106 106 0 0153-14z</StreamGeometry>
  <StreamGeometry x:Key="Icons.Remotes">M115 386l19 33c17 29 44 50 76 60l116 33c34 10 58 41 58 77v80c0 22 12 42 32 52s32 30 32 52v78c0 31 30 54 60 45 32-9 57-35 65-68l6-22c8-34 30-63 61-80l16-9c30-17 48-49 48-83v-17c0-25-10-50-28-68l-8-8c-18-18-42-28-68-28H514c-22 0-44-6-64-17l-69-39c-9-5-15-13-18-22-6-19 2-40 20-49l12-6c13-7 29-8 43-3l46 15c16 5 34-1 44-15 9-14 8-33-2-46l-27-33c-20-24-20-59 1-83l31-37c18-21 20-50 7-73l-5-8c-7-0-14-1-21-1-186 0-343 122-396 290zM928 512c0-74-19-143-53-203L824 330c-31 13-48 48-37 80l34 101c7 21 24 37 45 42l58 15c2-18 4-36 4-55zM0 512a512 512 0 111024 0 512 512 0 11-1024 0z</StreamGeometry>
  <StreamGeometry x:Key="Icons.RemoveAll">M1024 64v704h-128v128h-128v128h-768v-704h128v-128h128v-128zM64 960h640v-576h-640zM320 128v64h576v512h64v-576zM192 256v64h576v512h64v-576zM432 688L576 832H480L384 736 288 832H192l144-144L192 544h96L384 640l96-96H576z</StreamGeometry>
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@ -5,6 +5,7 @@
  <x:String x:Key="Text.About" xml:space="preserve">Info</x:String>
  <x:String x:Key="Text.About.Menu" xml:space="preserve">Über SourceGit</x:String>
  <x:String x:Key="Text.About.BuildWith" xml:space="preserve">• Erstellt mit </x:String>
+  <x:String x:Key="Text.About.Chart" xml:space="preserve">• Grafik gerendert durch </x:String>
  <x:String x:Key="Text.About.Copyright" xml:space="preserve">© 2024 sourcegit-scm</x:String>
  <x:String x:Key="Text.About.Editor" xml:space="preserve">• Texteditor von </x:String>
  <x:String x:Key="Text.About.Fonts" xml:space="preserve">• Monospace-Schriftarten von </x:String>
@ -85,8 +86,11 @@
  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Nichts tun</x:String>
  <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
  <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
+  <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Quelle an Commit-Nachricht anhängen</x:String>
  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
  <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Alle Änderungen committen</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline" xml:space="preserve">Hautplinie:</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">Normalerweise ist es nicht möglich einen Merge zu cherry-picken, da unklar ist welche Seite des Merges die Hauptlinie ist. Diese Option ermöglicht es die Änderungen relativ zum ausgewählten Vorgänger zu wiederholen.</x:String>
  <x:String x:Key="Text.ClearStashes" xml:space="preserve">Stashes löschen</x:String>
  <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">Du versuchst alle Stashes zu löschen. Möchtest du wirklich fortfahren?</x:String>
  <x:String x:Key="Text.Clone" xml:space="preserve">Remote Repository klonen</x:String>
@ -314,13 +318,11 @@
  <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Verfolge alle *{0} Dateien</x:String>
  <x:String x:Key="Text.Histories" xml:space="preserve">Verlauf</x:String>
  <x:String x:Key="Text.Histories.DisplayMode" xml:space="preserve">Wechsle zwischen horizontalem und vertikalem Layout</x:String>
-  <x:String x:Key="Text.Histories.GraphMode" xml:space="preserve">Wechsle zwischen Kurven- und Konturgraphenmodus</x:String>
  <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">AUTOR</x:String>
+  <x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">AUTOR ZEITPUNKT</x:String>
  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">GRAPH &amp; COMMIT-NACHRICHT</x:String>
  <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">SHA</x:String>
  <x:String x:Key="Text.Histories.Header.Time" xml:space="preserve">COMMIT ZEITPUNKT</x:String>
-  <x:String x:Key="Text.Histories.Search" xml:space="preserve">DURCHSUCHE SHA/SUBJEKT/AUTOR. DRÜCKE ZUM SUCHEN ENTER, ESC UM ABZUBRECHEN</x:String>
-  <x:String x:Key="Text.Histories.SearchClear" xml:space="preserve">LÖSCHEN</x:String>
  <x:String x:Key="Text.Histories.Selected" xml:space="preserve">{0} COMMITS AUSGEWÄHLT</x:String>
  <x:String x:Key="Text.Hotkeys" xml:space="preserve">Tastaturkürzel Referenz</x:String>
  <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">GLOBAL</x:String>
@ -359,10 +361,8 @@
  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interaktiver Rebase</x:String>
  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Ziel Branch:</x:String>
  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">Auf:</x:String>
-  <x:String x:Key="Text.Launcher" xml:space="preserve">Source Git</x:String>
  <x:String x:Key="Text.Launcher.Error" xml:space="preserve">FEHLER</x:String>
  <x:String x:Key="Text.Launcher.Info" xml:space="preserve">INFO</x:String>
-  <x:String x:Key="Text.Launcher.Menu" xml:space="preserve">Hauptmenü öffnen</x:String>
  <x:String x:Key="Text.Merge" xml:space="preserve">Branch mergen</x:String>
  <x:String x:Key="Text.Merge.Into" xml:space="preserve">Ziel-Branch:</x:String>
  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>
@ -371,9 +371,7 @@
  <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Wähle Vorgänger-Knoten für:</x:String>
  <x:String x:Key="Text.Name" xml:space="preserve">Name:</x:String>
  <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git wurde NICHT konfiguriert. Gehe bitte zuerst in die [Einstellungen] und konfiguriere Git.</x:String>
-  <x:String x:Key="Text.Notice" xml:space="preserve">BENACHRICHTIGUNG</x:String>
  <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">App-Daten Ordner öffnen</x:String>
-  <x:String x:Key="Text.OpenFolder" xml:space="preserve">ORDNER AUSWÄHLEN</x:String>
  <x:String x:Key="Text.OpenWith" xml:space="preserve">Öffne mit...</x:String>
  <x:String x:Key="Text.Optional" xml:space="preserve">Optional.</x:String>
  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">Neue Seite erstellen</x:String>
@ -415,6 +413,7 @@
  <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">Beim Starten nach Updates suchen</x:String>
  <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Sprache</x:String>
  <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">Commit-Historie</x:String>
+  <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Zeige Autor Zeitpunkt anstatt Commit Zeitpunkt</x:String>
  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Längenvorgabe für Commit-Nachrichten</x:String>
  <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
  <x:String x:Key="Text.Preference.Git.CRLF" xml:space="preserve">Aktiviere Auto-CRLF</x:String>
@ -563,6 +562,8 @@
  <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Inklusive nicht-verfolgter Dateien</x:String>
  <x:String x:Key="Text.Stash.Message" xml:space="preserve">Name:</x:String>
  <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">Optional. Name dieses Stashes</x:String>
+  <x:String x:Key="Text.Stash.OnlyStagedChanges" xml:space="preserve">Nur gestagte Änderungen</x:String>
+  <x:String x:Key="Text.Stash.TipForSelectedFiles" xml:space="preserve">Gestagte und unstagte Änderungen der ausgewähleten Datei(en) werden gestasht!!!</x:String>
  <x:String x:Key="Text.Stash.Title" xml:space="preserve">Lokale Änderungen stashen</x:String>
  <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Anwenden</x:String>
  <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Entfernen</x:String>
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@ -83,8 +83,11 @@
  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Do Nothing</x:String>
  <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
  <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
+  <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Append source to commit message</x:String>
  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
  <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Commit all changes</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline" xml:space="preserve">Mainline:</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option allows cherry-pick to replay the change relative to the specified parent.</x:String>
  <x:String x:Key="Text.ClearStashes" xml:space="preserve">Clear Stashes</x:String>
  <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">You are trying to clear all stashes. Are you sure to continue?</x:String>
  <x:String x:Key="Text.Clone" xml:space="preserve">Clone Remote Repository</x:String>
@ -155,6 +158,13 @@
  <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">Workspaces</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">Color</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">Restore tabs on startup</x:String>
+  <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Conventional Commit Helper</x:String>
+  <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">Breaking Change:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">Closed Issue:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Detail" xml:space="preserve">Detail Changes:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Scope" xml:space="preserve">Scope:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ShortDescription" xml:space="preserve">Short Description:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Type of Change:</x:String>
  <x:String x:Key="Text.Copy" xml:space="preserve">Copy</x:String>
  <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copy All Text</x:String>
  <x:String x:Key="Text.CopyMessage" xml:space="preserve">COPY MESSAGE</x:String>
@ -312,15 +322,15 @@
  <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Track all *{0} files</x:String>
  <x:String x:Key="Text.Histories" xml:space="preserve">Histories</x:String>
  <x:String x:Key="Text.Histories.DisplayMode" xml:space="preserve">Switch Horizontal/Vertical Layout</x:String>
-  <x:String x:Key="Text.Histories.GraphMode" xml:space="preserve">Switch Curve/Polyline Graph Mode</x:String>
  <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">AUTHOR</x:String>
  <x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">AUTHOR TIME</x:String>
  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">GRAPH &amp; SUBJECT</x:String>
  <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">SHA</x:String>
  <x:String x:Key="Text.Histories.Header.Time" xml:space="preserve">COMMIT TIME</x:String>
-  <x:String x:Key="Text.Histories.Search" xml:space="preserve">SEARCH SHA/SUBJECT/AUTHOR. PRESS ENTER TO SEARCH, ESC TO QUIT</x:String>
-  <x:String x:Key="Text.Histories.SearchClear" xml:space="preserve">CLEAR</x:String>
  <x:String x:Key="Text.Histories.Selected" xml:space="preserve">SELECTED {0} COMMITS</x:String>
+  <x:String x:Key="Text.Histories.Tips" xml:space="preserve">Holding 'Ctrl' or 'Shift' to select multiple commits.</x:String>
+  <x:String x:Key="Text.Histories.Tips.MacOS" xml:space="preserve">Holding ⌘ or ⇧ to select multiple commits.</x:String>
+  <x:String x:Key="Text.Histories.Tips.Prefix" xml:space="preserve">TIPS:</x:String>
  <x:String x:Key="Text.Hotkeys" xml:space="preserve">Keyboard Shortcuts Reference</x:String>
  <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">GLOBAL</x:String>
  <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">Cancel current popup</x:String>
@ -358,10 +368,8 @@
  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interactive Rebase</x:String>
  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Target Branch:</x:String>
  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">On:</x:String>
-  <x:String x:Key="Text.Launcher" xml:space="preserve">Source Git</x:String>
  <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERROR</x:String>
  <x:String x:Key="Text.Launcher.Info" xml:space="preserve">NOTICE</x:String>
-  <x:String x:Key="Text.Launcher.Menu" xml:space="preserve">Open Main Menu</x:String>
  <x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
  <x:String x:Key="Text.Merge.Into" xml:space="preserve">Into:</x:String>
  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>
@ -370,9 +378,7 @@
  <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Select parent node for:</x:String>
  <x:String x:Key="Text.Name" xml:space="preserve">Name:</x:String>
  <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git has NOT been configured. Please to go [Preference] and configure it first.</x:String>
-  <x:String x:Key="Text.Notice" xml:space="preserve">NOTICE</x:String>
  <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">Open App Data Dir</x:String>
-  <x:String x:Key="Text.OpenFolder" xml:space="preserve">SELECT FOLDER</x:String>
  <x:String x:Key="Text.OpenWith" xml:space="preserve">Open With...</x:String>
  <x:String x:Key="Text.Optional" xml:space="preserve">Optional.</x:String>
  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">Create New Page</x:String>
@ -500,6 +506,7 @@
  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">Clear all</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.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>
  <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">FILTERED BY:</x:String>
@ -592,6 +599,7 @@
  <x:String x:Key="Text.Submodule.Remove" xml:space="preserve">Delete Submodule</x:String>
  <x:String x:Key="Text.Sure" xml:space="preserve">OK</x:String>
  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Copy Tag Name</x:String>
+  <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">Copy Tag Message</x:String>
  <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Delete ${0}$...</x:String>
  <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push ${0}$...</x:String>
  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@ -302,13 +302,10 @@
  <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Track all *{0} files</x:String>
  <x:String x:Key="Text.Histories" xml:space="preserve">Historique</x:String>
  <x:String x:Key="Text.Histories.DisplayMode" xml:space="preserve">Basculer entre dispositions Horizontal/Vertical</x:String>
-  <x:String x:Key="Text.Histories.GraphMode" xml:space="preserve">Basculer en un graph courbe ou polyligne</x:String>
  <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">AUTEUR</x:String>
  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">GRAPHE &amp; SUJET</x:String>
  <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">SHA</x:String>
  <x:String x:Key="Text.Histories.Header.Time" xml:space="preserve">HEURE DE COMMIT</x:String>
-  <x:String x:Key="Text.Histories.Search" xml:space="preserve">CHERCHER UN SHA/SUJET/AUTEUR. ENTRÉE POUR CHERCHER, ESC POUR QUITTER</x:String>
-  <x:String x:Key="Text.Histories.SearchClear" xml:space="preserve">EFFACER</x:String>
  <x:String x:Key="Text.Histories.Selected" xml:space="preserve">{0} COMMITS SÉLECTIONNÉS</x:String>
  <x:String x:Key="Text.Hotkeys" xml:space="preserve">Référence des raccourcis clavier</x:String>
  <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">GLOBAL</x:String>
@ -345,19 +342,15 @@
  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interactive Rebase</x:String>
  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Target Branch:</x:String>
  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">On:</x:String>
-  <x:String x:Key="Text.Launcher" xml:space="preserve">Source Git</x:String>
  <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERROR</x:String>
  <x:String x:Key="Text.Launcher.Info" xml:space="preserve">NOTICE</x:String>
-  <x:String x:Key="Text.Launcher.Menu" xml:space="preserve">Open Main Menu</x:String>
  <x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
  <x:String x:Key="Text.Merge.Into" xml:space="preserve">Into:</x:String>
  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>
  <x:String x:Key="Text.Merge.Source" xml:space="preserve">Source Branch:</x:String>
  <x:String x:Key="Text.Name" xml:space="preserve">Nom :</x:String>
  <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git n'a PAS été configuré. Veuillez d'abord le faire dans le menu Préférence.</x:String>
-  <x:String x:Key="Text.Notice" xml:space="preserve">NOTICE</x:String>
  <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">Ouvrir le dossier AppData</x:String>
-  <x:String x:Key="Text.OpenFolder" xml:space="preserve">SELECT FOLDER</x:String>
  <x:String x:Key="Text.OpenWith" xml:space="preserve">Open With...</x:String>
  <x:String x:Key="Text.Optional" xml:space="preserve">Optional.</x:String>
  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">Créer un nouvel onglet</x:String>
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@ -297,13 +297,10 @@
  <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Rastrear todos os arquivos *{0}</x:String>
  <x:String x:Key="Text.Histories" xml:space="preserve">Históricos</x:String>
  <x:String x:Key="Text.Histories.DisplayMode" xml:space="preserve">Alternar Layout Horizontal/Vertical</x:String>
-  <x:String x:Key="Text.Histories.GraphMode" xml:space="preserve">Alternar Modo de Gráfico Curvo/Polilinha</x:String>
  <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">AUTOR</x:String>
  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">GRÁFICO &amp; ASSUNTO</x:String>
  <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">SHA</x:String>
  <x:String x:Key="Text.Histories.Header.Time" xml:space="preserve">HORA DO COMMIT</x:String>
-  <x:String x:Key="Text.Histories.Search" xml:space="preserve">PROCURAR SHA/ASSUNTO/AUTOR. PRESSIONE ENTER PARA PROCURAR, ESC PARA SAIR</x:String>
-  <x:String x:Key="Text.Histories.SearchClear" xml:space="preserve">LIMPAR</x:String>
  <x:String x:Key="Text.Histories.Selected" xml:space="preserve">SELECIONADO {0} COMMITS</x:String>
  <x:String x:Key="Text.Hotkeys" xml:space="preserve">Referência de Atalhos de Teclado</x:String>
  <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">GLOBAL</x:String>
@ -340,19 +337,15 @@
  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Rebase Interativo</x:String>
  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Ramo Alvo:</x:String>
  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">Em:</x:String>
-  <x:String x:Key="Text.Launcher" xml:space="preserve">Source Git</x:String>
  <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERRO</x:String>
  <x:String x:Key="Text.Launcher.Info" xml:space="preserve">AVISO</x:String>
-  <x:String x:Key="Text.Launcher.Menu" xml:space="preserve">Abrir Menu Principal</x:String>
  <x:String x:Key="Text.Merge" xml:space="preserve">Mesclar Ramo</x:String>
  <x:String x:Key="Text.Merge.Into" xml:space="preserve">Para:</x:String>
  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Opção de Mesclagem:</x:String>
  <x:String x:Key="Text.Merge.Source" xml:space="preserve">Ramo de Origem:</x:String>
  <x:String x:Key="Text.Name" xml:space="preserve">Nome:</x:String>
  <x:String x:Key="Text.NotConfigured" xml:space="preserve">O Git NÃO foi configurado. Por favor, vá para [Preferências] e configure primeiro.</x:String>
-  <x:String x:Key="Text.Notice" xml:space="preserve">AVISO</x:String>
  <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">Abrir Pasta de Dados do Aplicativo</x:String>
-  <x:String x:Key="Text.OpenFolder" xml:space="preserve">SELECIONAR PASTA</x:String>
  <x:String x:Key="Text.OpenWith" xml:space="preserve">Abrir Com...</x:String>
  <x:String x:Key="Text.Optional" xml:space="preserve">Opcional.</x:String>
  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">Criar Nova Página</x:String>
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@ -86,8 +86,11 @@
  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Ничего не делать</x:String>
  <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Отложить и примненить повторно</x:String>
  <x:String x:Key="Text.CherryPick" xml:space="preserve"> Частичный выбор</x:String>
+  <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Добавить источник для фиксации сообщения</x:String>
  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Фиксация(и):</x:String>
  <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Фиксировать все изменения.</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline" xml:space="preserve">Основной:</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">Обычно вы не можете выделить слияние, потому что не знаете, какую сторону слияния следует считать основной. Эта опция позволяет отобразить изменение относительно указанного родительского элемента.</x:String>
  <x:String x:Key="Text.ClearStashes" xml:space="preserve">Очистить отложенные</x:String>
  <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">Вы пытаетесь очистить все отложенные. Вы уверены, что будете продолжать?</x:String>
  <x:String x:Key="Text.Clone" xml:space="preserve">Клонировать внешнее хранилище</x:String>
@ -158,6 +161,14 @@
  <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">Рабочие пространства</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Name" xml:space="preserve">Имя</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">Цвет</x:String>
+  <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">Восстанавливать вкладки при запуске</x:String>
+  <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Общепринятый помощник по фиксации изменений</x:String>
+  <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">Кардинальные изменения:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">Закрытая тема:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Detail" xml:space="preserve">Детали изменений:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Scope" xml:space="preserve">Область:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ShortDescription" xml:space="preserve">Коротнкое описание:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Тип изменения:</x:String>
  <x:String x:Key="Text.Copy" xml:space="preserve">Копировать</x:String>
  <x:String x:Key="Text.CopyAllText" xml:space="preserve">Копировать весь текст</x:String>
  <x:String x:Key="Text.CopyMessage" xml:space="preserve">КОПИРОВАТЬ СООБЩЕНИЕ</x:String>
@ -182,7 +193,7 @@
  <x:String x:Key="Text.CreateTag.Name.Placeholder" xml:space="preserve">Рекомендуемый формат: v1.0.0-alpha</x:String>
  <x:String x:Key="Text.CreateTag.PushToAllRemotes" xml:space="preserve">Выложить на все внешние хранилища после создания</x:String>
  <x:String x:Key="Text.CreateTag.Title" xml:space="preserve">Создать новую метку</x:String>
-  <x:String x:Key="Text.CreateTag.Type" xml:space="preserve">Добрый:</x:String>
+  <x:String x:Key="Text.CreateTag.Type" xml:space="preserve">Вид:</x:String>
  <x:String x:Key="Text.CreateTag.Type.Annotated" xml:space="preserve">Аннотированный</x:String>
  <x:String x:Key="Text.CreateTag.Type.Lightweight" xml:space="preserve">Лёгкий</x:String>
  <x:String x:Key="Text.CtrlClickTip" xml:space="preserve">Удерживайте Ctrl, чтобы начать непосредственно</x:String>
@ -293,7 +304,7 @@
  <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">Добавить шаблон отслеживания в ХБФ Git</x:String>
  <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">Извлечь</x:String>
  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">Извлечь объекты ХБФ</x:String>
-  <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Запустите `git lfs fetch", чтобы загрузить объекты ХБФ Git. При этом рабочая копия не обновляется.</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Запустить `git lfs fetch", чтобы загрузить объекты ХБФ Git. При этом рабочая копия не обновляется.</x:String>
  <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Установить перехват ХБФ Git</x:String>
  <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">Показать блокировки</x:String>
  <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">Нет заблокированных файлов</x:String>
@ -315,15 +326,15 @@
  <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Отслеживать все *{0} файлов</x:String>
  <x:String x:Key="Text.Histories" xml:space="preserve">Истории</x:String>
  <x:String x:Key="Text.Histories.DisplayMode" xml:space="preserve">Переключение горизонтального/вертикального расположения</x:String>
-  <x:String x:Key="Text.Histories.GraphMode" xml:space="preserve">Переключение режима построения кривой/полилинии</x:String>
  <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">АВТОР</x:String>
  <x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">ВРЕМЯ АВТОРА</x:String>
  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">ГРАФ И СУБЪЕКТ</x:String>
  <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">SHA</x:String>
  <x:String x:Key="Text.Histories.Header.Time" xml:space="preserve">ВРЕМЯ ФИКСАЦИИ</x:String>
-  <x:String x:Key="Text.Histories.Search" xml:space="preserve">ПОИСК SHA/СУБЪЕКТ/АВТОР. НАЖМИТЕ ВВОД ДЛЯ ПОИСКА, ESC ДЛЯ ВЫХОДА</x:String>
-  <x:String x:Key="Text.Histories.SearchClear" xml:space="preserve">ОЧИСТИТЬ</x:String>
  <x:String x:Key="Text.Histories.Selected" xml:space="preserve">ВЫБРАННЫЕ {0} ФИКСАЦИИ</x:String>
+  <x:String x:Key="Text.Histories.Tips" xml:space="preserve">Удерживайте 'Ctrl' или 'Shift', чтобы выбрать несколько фиксаций.</x:String>
+  <x:String x:Key="Text.Histories.Tips.MacOS" xml:space="preserve">Удерживайте ⌘ или ⇧, чтобы выбрать несколько фиксаций.</x:String>
+  <x:String x:Key="Text.Histories.Tips.Prefix" xml:space="preserve">ПОДСКАЗКИ:</x:String>
  <x:String x:Key="Text.Hotkeys" xml:space="preserve">Ссылка на сочетания клавиш</x:String>
  <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">ОБЩЕЕ</x:String>
  <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">Отменить текущее всплывающее окно</x:String>
@ -361,10 +372,8 @@
  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Интерактивное перемещение</x:String>
  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Целевая ветка:</x:String>
  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">На:</x:String>
-  <x:String x:Key="Text.Launcher" xml:space="preserve">Source Git</x:String>
  <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ОШИБКА</x:String>
  <x:String x:Key="Text.Launcher.Info" xml:space="preserve">УВЕДОМЛЕНИЕ</x:String>
-  <x:String x:Key="Text.Launcher.Menu" xml:space="preserve">Открыть главное меню</x:String>
  <x:String x:Key="Text.Merge" xml:space="preserve">Слить ветку</x:String>
  <x:String x:Key="Text.Merge.Into" xml:space="preserve">В:</x:String>
  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Опции слияния:</x:String>
@ -373,9 +382,7 @@
  <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Выбрать родительский узел для:</x:String>
  <x:String x:Key="Text.Name" xml:space="preserve">Имя:</x:String>
  <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git НЕ был настроен. Пожалуйста, перейдите в [Настройки] и сначала настройте его.</x:String>
-  <x:String x:Key="Text.Notice" xml:space="preserve">УВЕДОМЛЕНИЕ</x:String>
  <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">Открыть приложение каталогов данных</x:String>
-  <x:String x:Key="Text.OpenFolder" xml:space="preserve">ВЫБОР КАТАЛОГА</x:String>
  <x:String x:Key="Text.OpenWith" xml:space="preserve">Окрыть с...</x:String>
  <x:String x:Key="Text.Optional" xml:space="preserve">Необязательно.</x:String>
  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">Создать новую страницу</x:String>
@ -595,6 +602,7 @@
  <x:String x:Key="Text.Submodule.Remove" xml:space="preserve">Удалить подмодуль</x:String>
  <x:String x:Key="Text.Sure" xml:space="preserve">ОК</x:String>
  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Копировать имя метки</x:String>
+  <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">Копировать сообщение с метки</x:String>
  <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Удалить ${0}$...</x:String>
  <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Выложить ${0}$...</x:String>
  <x:String x:Key="Text.URL" xml:space="preserve">Сетевой адрес:</x:String>
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@ -86,8 +86,11 @@
  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">不做处理</x:String>
  <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">贮藏并自动恢复</x:String>
  <x:String x:Key="Text.CherryPick" xml:space="preserve">挑选提交</x:String>
+  <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">提交信息中追加来源信息</x:String>
  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">提交列表 ：</x:String>
  <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">提交变化</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline" xml:space="preserve">对比的父提交 ：</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">通常你不能对一个合并进行挑选，因为你不知道合并的哪一边应该被视为主线。这个选项指定了作为主线的父提交，允许挑选相对于该提交的修改。</x:String>
  <x:String x:Key="Text.ClearStashes" xml:space="preserve">丢弃贮藏确认</x:String>
  <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">您正在丢弃所有的贮藏，一经操作，无法回退，是否继续？</x:String>
  <x:String x:Key="Text.Clone" xml:space="preserve">克隆远程仓库</x:String>
@ -158,6 +161,13 @@
  <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">工作区</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">颜色</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">启动时恢复打开的仓库</x:String>
+  <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">规范化提交信息生成</x:String>
+  <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">破坏性更新：</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">关闭的ISSUE：</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Detail" xml:space="preserve">详细说明：</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Scope" xml:space="preserve">模块：</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ShortDescription" xml:space="preserve">简述：</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">类型：</x:String>
  <x:String x:Key="Text.Copy" xml:space="preserve">复制</x:String>
  <x:String x:Key="Text.CopyAllText" xml:space="preserve">复制全部文本</x:String>
  <x:String x:Key="Text.CopyMessage" xml:space="preserve">复制内容</x:String>
@ -315,15 +325,15 @@
  <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">跟踪所有 *{0} 文件</x:String>
  <x:String x:Key="Text.Histories" xml:space="preserve">历史记录</x:String>
  <x:String x:Key="Text.Histories.DisplayMode" xml:space="preserve">切换横向/纵向显示</x:String>
-  <x:String x:Key="Text.Histories.GraphMode" xml:space="preserve">切换曲线/折线显示</x:String>
  <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">作者</x:String>
  <x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">修改时间</x:String>
  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">路线图与主题</x:String>
  <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">提交指纹</x:String>
  <x:String x:Key="Text.Histories.Header.Time" xml:space="preserve">提交时间</x:String>
-  <x:String x:Key="Text.Histories.Search" xml:space="preserve">查询提交指纹、信息、作者。回车键开始，ESC键取消</x:String>
-  <x:String x:Key="Text.Histories.SearchClear" xml:space="preserve">清空</x:String>
  <x:String x:Key="Text.Histories.Selected" xml:space="preserve">已选中 {0} 项提交</x:String>
+  <x:String x:Key="Text.Histories.Tips" xml:space="preserve">可以按住 Ctrl 或 Shift 键选择多个提交</x:String>
+  <x:String x:Key="Text.Histories.Tips.MacOS" xml:space="preserve">可以按住 ⌘ 或 ⇧ 键选择多个提交</x:String>
+  <x:String x:Key="Text.Histories.Tips.Prefix" xml:space="preserve">小提示:</x:String>
  <x:String x:Key="Text.Hotkeys" xml:space="preserve">快捷键参考</x:String>
  <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">全局快捷键</x:String>
  <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">取消弹出面板</x:String>
@ -361,10 +371,8 @@
  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">交互式变基</x:String>
  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">目标分支 ：</x:String>
  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">起始提交 ：</x:String>
-  <x:String x:Key="Text.Launcher" xml:space="preserve">Source Git</x:String>
  <x:String x:Key="Text.Launcher.Error" xml:space="preserve">出错了</x:String>
  <x:String x:Key="Text.Launcher.Info" xml:space="preserve">系统提示</x:String>
-  <x:String x:Key="Text.Launcher.Menu" xml:space="preserve">主菜单</x:String>
  <x:String x:Key="Text.Merge" xml:space="preserve">合并分支</x:String>
  <x:String x:Key="Text.Merge.Into" xml:space="preserve">目标分支 ：</x:String>
  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">合并方式 ：</x:String>
@ -373,9 +381,7 @@
  <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">请选择目标分组：</x:String>
  <x:String x:Key="Text.Name" xml:space="preserve">名称 ：</x:String>
  <x:String x:Key="Text.NotConfigured" xml:space="preserve">GIT尚未配置。请打开【偏好设置】配置GIT路径。</x:String>
-  <x:String x:Key="Text.Notice" xml:space="preserve">系统提示</x:String>
  <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">浏览应用数据目录</x:String>
-  <x:String x:Key="Text.OpenFolder" xml:space="preserve">选择文件夹</x:String>
  <x:String x:Key="Text.OpenWith" xml:space="preserve">打开文件...</x:String>
  <x:String x:Key="Text.Optional" xml:space="preserve">选填。</x:String>
  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">新建空白页</x:String>
@ -498,6 +504,7 @@
  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" 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.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>
  <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">过滤规则 ：</x:String>
@ -590,6 +597,7 @@
  <x:String x:Key="Text.Submodule.Remove" xml:space="preserve">删除子模块</x:String>
  <x:String x:Key="Text.Sure" xml:space="preserve">确    定</x:String>
  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">复制标签名</x:String>
+  <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">复制标签信息</x:String>
  <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">删除 ${0}$...</x:String>
  <x:String x:Key="Text.TagCM.Push" xml:space="preserve">推送 ${0}$...</x:String>
  <x:String x:Key="Text.URL" xml:space="preserve">仓库地址 ：</x:String>
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@ -86,8 +86,11 @@
  <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">不做處理</x:String>
  <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">擱置變更並自動復原</x:String>
  <x:String x:Key="Text.CherryPick" xml:space="preserve">揀選提交</x:String>
+  <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">提交資訊中追加來源資訊</x:String>
  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">提交列表:</x:String>
  <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">提交變更</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline" xml:space="preserve">對比的父提交:</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">通常您不能對一個合併進行揀選 (cherry-pick)，因為您不知道合併的哪一邊應該被視為主線。這個選項指定了作為主線的父提交，允許揀選相對於該提交的修改。</x:String>
  <x:String x:Key="Text.ClearStashes" xml:space="preserve">捨棄擱置變更確認</x:String>
  <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">您正在捨棄所有的擱置變更，一經操作便無法復原，是否繼續?</x:String>
  <x:String x:Key="Text.Clone" xml:space="preserve">複製 (clone) 遠端存放庫</x:String>
@ -158,6 +161,13 @@
  <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">工作區</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">顏色</x:String>
  <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">啟動時還原上次開啟的存放庫</x:String>
+  <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">產生約定式提交訊息</x:String>
+  <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">破壞性變更:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">關閉的 Issue:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Detail" xml:space="preserve">詳細資訊:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Scope" xml:space="preserve">模組:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ShortDescription" xml:space="preserve">簡述:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">類型:</x:String>
  <x:String x:Key="Text.Copy" xml:space="preserve">複製</x:String>
  <x:String x:Key="Text.CopyAllText" xml:space="preserve">複製全部內容</x:String>
  <x:String x:Key="Text.CopyMessage" xml:space="preserve">複製內容</x:String>
@ -315,15 +325,15 @@
  <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">追蹤所有 *{0} 檔案</x:String>
  <x:String x:Key="Text.Histories" xml:space="preserve">歷史記錄</x:String>
  <x:String x:Key="Text.Histories.DisplayMode" xml:space="preserve">切換橫向/縱向顯示</x:String>
-  <x:String x:Key="Text.Histories.GraphMode" xml:space="preserve">切換曲線/折線顯示</x:String>
  <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">作者</x:String>
  <x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">修改時間</x:String>
  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">路線圖與訊息標題</x:String>
  <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">提交編號</x:String>
  <x:String x:Key="Text.Histories.Header.Time" xml:space="preserve">提交時間</x:String>
-  <x:String x:Key="Text.Histories.Search" xml:space="preserve">搜尋提交編號、訊息、作者。按下 Enter 鍵以搜尋，ESC 鍵取消</x:String>
-  <x:String x:Key="Text.Histories.SearchClear" xml:space="preserve">清空</x:String>
  <x:String x:Key="Text.Histories.Selected" xml:space="preserve">已選取 {0} 項提交</x:String>
+  <x:String x:Key="Text.Histories.Tips" xml:space="preserve">可以按住 Ctrl 或 Shift 鍵選擇多個提交</x:String>
+  <x:String x:Key="Text.Histories.Tips.MacOS" xml:space="preserve">可以按住 ⌘ 或 ⇧ 鍵選擇多個提交</x:String>
+  <x:String x:Key="Text.Histories.Tips.Prefix" xml:space="preserve">小提示:</x:String>
  <x:String x:Key="Text.Hotkeys" xml:space="preserve">快速鍵參考</x:String>
  <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">全域快速鍵</x:String>
  <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">取消彈出面板</x:String>
@ -361,10 +371,8 @@
  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">互動式重定基底</x:String>
  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">目標分支:</x:String>
  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">起始提交:</x:String>
-  <x:String x:Key="Text.Launcher" xml:space="preserve">Source Git</x:String>
  <x:String x:Key="Text.Launcher.Error" xml:space="preserve">發生錯誤</x:String>
  <x:String x:Key="Text.Launcher.Info" xml:space="preserve">系統提示</x:String>
-  <x:String x:Key="Text.Launcher.Menu" xml:space="preserve">主選單</x:String>
  <x:String x:Key="Text.Merge" xml:space="preserve">合併分支</x:String>
  <x:String x:Key="Text.Merge.Into" xml:space="preserve">目標分支:</x:String>
  <x:String x:Key="Text.Merge.Mode" xml:space="preserve">合併方式:</x:String>
@ -373,9 +381,7 @@
  <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">請選擇目標分組:</x:String>
  <x:String x:Key="Text.Name" xml:space="preserve">名稱:</x:String>
  <x:String x:Key="Text.NotConfigured" xml:space="preserve">尚未設定 Git。請開啟 [偏好設定] 以設定 Git 路徑。</x:String>
-  <x:String x:Key="Text.Notice" xml:space="preserve">系統提示</x:String>
  <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">瀏覽程式資料目錄</x:String>
-  <x:String x:Key="Text.OpenFolder" xml:space="preserve">選擇資料夾</x:String>
  <x:String x:Key="Text.OpenWith" xml:space="preserve">開啟檔案...</x:String>
  <x:String x:Key="Text.Optional" xml:space="preserve">選填。</x:String>
  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">新增分頁</x:String>
@ -503,6 +509,7 @@
  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" 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.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>
  <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">篩選規則:</x:String>
@ -521,7 +528,7 @@
  <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">提交訊息</x:String>
  <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">提交編號</x:String>
  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">作者及提交者</x:String>
-  <x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">僅搜尋當前分支</x:String>
+  <x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">僅搜尋目前分支</x:String>
  <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">以樹型結構展示</x:String>
  <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">提交統計</x:String>
  <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">子模組列表</x:String>
@ -567,7 +574,7 @@
  <x:String x:Key="Text.Stash.Message" xml:space="preserve">擱置變更訊息:</x:String>
  <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">選填，用於命名此擱置變更</x:String>
  <x:String x:Key="Text.Stash.OnlyStagedChanges" xml:space="preserve">僅擱置已暫存的變更</x:String>
-  <x:String x:Key="Text.Stash.TipForSelectedFiles" xml:space="preserve">選中檔案的所有變更均會被擱置！</x:String>
+  <x:String x:Key="Text.Stash.TipForSelectedFiles" xml:space="preserve">已選取的檔案中的變更均會被擱置!</x:String>
  <x:String x:Key="Text.Stash.Title" xml:space="preserve">擱置本機變更</x:String>
  <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">套用 (apply)</x:String>
  <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">刪除 (drop)</x:String>
@ -595,6 +602,7 @@
  <x:String x:Key="Text.Submodule.Remove" xml:space="preserve">刪除子模組</x:String>
  <x:String x:Key="Text.Sure" xml:space="preserve">確  定</x:String>
  <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">複製標籤名稱</x:String>
+  <x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">複製標籤訊息</x:String>
  <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">刪除 ${0}$...</x:String>
  <x:String x:Key="Text.TagCM.Push" xml:space="preserve">推送 ${0}$...</x:String>
  <x:String x:Key="Text.URL" xml:space="preserve">存放庫網址:</x:String>
--- a/src/Resources/Themes.axaml
+++ b/src/Resources/Themes.axaml
@ -10,12 +10,7 @@
      <Color x:Key="Color.Contents">#FFFAFAFA</Color>
      <Color x:Key="Color.Badge">#FFB0CEE8</Color>
      <Color x:Key="Color.BadgeFG">#FF1F1F1F</Color>
-      <Color x:Key="Color.DecoratorIconBG">#A0A0A0</Color>
-      <Color x:Key="Color.DecoratorIcon">White</Color>
-      <Color x:Key="Color.DecoratorBranch">#008585</Color>
-      <Color x:Key="Color.DecoratorHead">#0C0E21</Color>
-      <Color x:Key="Color.DecoratorTag">#79855f</Color>
-      <Color x:Key="Color.DecoratorFG">White</Color>
+      <Color x:Key="Color.DecoratorTag">DarkGreen</Color>
      <Color x:Key="Color.Conflict">#FF836C2E</Color>
      <Color x:Key="Color.ConflictForeground">#FFFFFFFF</Color>
      <Color x:Key="Color.Border0">#FFCFCFCF</Color>
@ -42,12 +37,7 @@
      <Color x:Key="Color.Contents">#FF1C1C1C</Color>
      <Color x:Key="Color.Badge">#FF8F8F8F</Color>
      <Color x:Key="Color.BadgeFG">#FFDDDDDD</Color>
-      <Color x:Key="Color.DecoratorIconBG">#FF505050</Color>
-      <Color x:Key="Color.DecoratorIcon">#FFF8F8F8</Color>
-      <Color x:Key="Color.DecoratorBranch">#FFFFB835</Color>
-      <Color x:Key="Color.DecoratorHead">#f4f1de</Color>
      <Color x:Key="Color.DecoratorTag">#84c88a</Color>
-      <Color x:Key="Color.DecoratorFG">Black</Color>
      <Color x:Key="Color.Conflict">#FFFAFAD2</Color>
      <Color x:Key="Color.ConflictForeground">#FF252525</Color>
      <Color x:Key="Color.Border0">#FF181818</Color>
@ -74,12 +64,7 @@
  <SolidColorBrush x:Key="Brush.Contents" Color="{DynamicResource Color.Contents}"/>
  <SolidColorBrush x:Key="Brush.Badge" Color="{DynamicResource Color.Badge}"/>
  <SolidColorBrush x:Key="Brush.BadgeFG" Color="{DynamicResource Color.BadgeFG}"/>
-  <SolidColorBrush x:Key="Brush.DecoratorIconBG" Color="{DynamicResource Color.DecoratorIconBG}"/>
-  <SolidColorBrush x:Key="Brush.DecoratorIcon" Color="{DynamicResource Color.DecoratorIcon}"/>
-  <SolidColorBrush x:Key="Brush.DecoratorBranch" Color="{DynamicResource Color.DecoratorBranch}"/>
-  <SolidColorBrush x:Key="Brush.DecoratorHead" Color="{DynamicResource Color.DecoratorHead}"/>
  <SolidColorBrush x:Key="Brush.DecoratorTag" Color="{DynamicResource Color.DecoratorTag}"/>
-  <SolidColorBrush x:Key="Brush.DecoratorFG" Color="{DynamicResource Color.DecoratorFG}"/>
  <SolidColorBrush x:Key="Brush.Conflict" Color="{DynamicResource Color.Conflict}"/>
  <SolidColorBrush x:Key="Brush.ConflictForeground" Color="{DynamicResource Color.ConflictForeground}"/>
  <SolidColorBrush x:Key="Brush.Border0" Color="{DynamicResource Color.Border0}"/>
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@ -38,14 +38,14 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.1.3" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.3" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.1.3" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="Avalonia" Version="11.1.4" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.1.4" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.4" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.4" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.1.4" Condition="'$(Configuration)' == 'Debug'" />
    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
    <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />    
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />    
    <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc3.3" />
    <PackageReference Include="TextMateSharp" Version="1.0.63" />
    <PackageReference Include="TextMateSharp.Grammars" Version="1.0.63" />
--- a/src/ViewModels/CherryPick.cs
+++ b/src/ViewModels/CherryPick.cs
@ -12,6 +12,30 @@ namespace SourceGit.ViewModels
            private set;
        }

+        public bool IsMergeCommit
+        {
+            get;
+            private set;
+        }
+
+        public List<Models.Commit> ParentsForMergeCommit
+        {
+            get;
+            private set;
+        }
+
+        public int MainlineForMergeCommit
+        {
+            get;
+            set;
+        }
+
+        public bool AppendSourceToMessage
+        {
+            get;
+            set;
+        }
+
        public bool AutoCommit
        {
            get;
@ -22,6 +46,22 @@ namespace SourceGit.ViewModels
        {
            _repo = repo;
            Targets = targets;
+            IsMergeCommit = false;
+            ParentsForMergeCommit = [];
+            MainlineForMergeCommit = 0;
+            AppendSourceToMessage = true;
+            AutoCommit = true;
+            View = new Views.CherryPick() { DataContext = this };
+        }
+
+        public CherryPick(Repository repo, Models.Commit merge, List<Models.Commit> parents)
+        {
+            _repo = repo;
+            Targets = [merge];
+            IsMergeCommit = true;
+            ParentsForMergeCommit = parents;
+            MainlineForMergeCommit = 0;
+            AppendSourceToMessage = true;
            AutoCommit = true;
            View = new Views.CherryPick() { DataContext = this };
        }
@ -33,12 +73,30 @@ namespace SourceGit.ViewModels

            return Task.Run(() =>
            {
-                // Get commit SHAs reverted
-                var builder = new StringBuilder();
-                for (int i = Targets.Count - 1; i >= 0; i--)
-                    builder.Append($"{Targets[i].SHA} ");
+                var succ = false;
+                if (IsMergeCommit)
+                {
+                    succ = new Commands.CherryPick(
+                        _repo.FullPath,
+                        Targets[0].SHA,
+                        !AutoCommit,
+                        AppendSourceToMessage,
+                        $"-m {MainlineForMergeCommit + 1}").Exec();
+                }
+                else
+                {
+                    var builder = new StringBuilder();
+                    for (int i = Targets.Count - 1; i >= 0; i--)
+                        builder.Append($"{Targets[i].SHA} ");
+
+                    succ = new Commands.CherryPick(
+                        _repo.FullPath,
+                        builder.ToString(),
+                        !AutoCommit,
+                        AppendSourceToMessage,
+                        string.Empty).Exec();
+                }

-                var succ = new Commands.CherryPick(_repo.FullPath, builder.ToString(), !AutoCommit).Exec();
                CallUIThread(() => _repo.SetWatcherEnabled(true));
                return succ;
            });
--- a/src/ViewModels/ConventionalCommitMessageBuilder.cs
+++ b/src/ViewModels/ConventionalCommitMessageBuilder.cs
@ -0,0 +1,112 @@
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using System.Text;
+
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace SourceGit.ViewModels
+{
+    public class ConventionalCommitMessageBuilder : ObservableValidator
+    {
+        [Required(ErrorMessage = "Type of changes can not be null")]
+        public Models.ConventionalCommitType Type
+        {
+            get => _type;
+            set => SetProperty(ref _type, value, true);
+        }
+
+        public string Scope
+        {
+            get => _scope;
+            set => SetProperty(ref _scope, value);
+        }
+
+        [Required(ErrorMessage = "Short description can not be empty")]
+        public string Description
+        {
+            get => _description;
+            set => SetProperty(ref _description, value, true);
+        }
+
+        public string Detail
+        {
+            get => _detail;
+            set => SetProperty(ref _detail, value);
+        }
+
+        public string BreakingChanges
+        {
+            get => _breakingChanges;
+            set => SetProperty(ref _breakingChanges, value);
+        }
+
+        public string ClosedIssue
+        {
+            get => _closedIssue;
+            set => SetProperty(ref _closedIssue, value);
+        }
+
+        public ConventionalCommitMessageBuilder(WorkingCopy wc)
+        {
+            _wc = wc;
+        }
+
+        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode")]
+        public bool Apply()
+        {
+            if (HasErrors)
+                return false;
+
+            ValidateAllProperties();
+            if (HasErrors)
+                return false;
+
+            var builder = new StringBuilder();
+            builder.Append(_type.Type);
+
+            if (!string.IsNullOrEmpty(_scope))
+            {
+                builder.Append("(");
+                builder.Append(_scope);
+                builder.Append("): ");
+            }
+            else
+            {
+                builder.Append(": ");
+            }
+
+            builder.Append(_description);
+            builder.Append("\n\n");
+
+            if (!string.IsNullOrEmpty(_detail))
+            {
+                builder.Append(_detail);
+                builder.Append("\n\n");
+            }
+
+            if (!string.IsNullOrEmpty(_breakingChanges))
+            {
+                builder.Append("BREAKING CHANGE: ");
+                builder.Append(_breakingChanges);
+                builder.Append("\n\n");
+            }
+
+            if (!string.IsNullOrEmpty(_closedIssue))
+            {
+                builder.Append("Closed ");
+                builder.Append(_closedIssue);
+            }
+
+            _wc.CommitMessage = builder.ToString();
+            return true;
+        }
+
+        private WorkingCopy _wc = null;
+        private Models.ConventionalCommitType _type = Models.ConventionalCommitType.Supported[0];
+        private string _scope = string.Empty;
+        private string _description = string.Empty;
+        private string _detail = string.Empty;
+        private string _breakingChanges = string.Empty;
+        private string _closedIssue = string.Empty;
+    }
+}
--- a/src/ViewModels/Discard.cs
+++ b/src/ViewModels/Discard.cs
@ -29,7 +29,7 @@ namespace SourceGit.ViewModels
            set;
        } = 0;
    }
-    
+
    public class Discard : Popup
    {
        public object Mode
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@ -156,7 +156,7 @@ namespace SourceGit.ViewModels

                if (_repo.SearchResultSelectedCommit == null || _repo.SearchResultSelectedCommit.SHA != commit.SHA)
                {
-                    _repo.SearchResultSelectedCommit = _repo.SearchedCommits.Find(x => x.SHA == commit.SHA);   
+                    _repo.SearchResultSelectedCommit = _repo.SearchedCommits.Find(x => x.SHA == commit.SHA);
                }

                AutoSelectedCommit = commit;
@ -424,7 +424,28 @@ namespace SourceGit.ViewModels
                cherryPick.Click += (_, e) =>
                {
                    if (PopupHost.CanCreatePopup())
-                        PopupHost.ShowPopup(new CherryPick(_repo, [commit]));
+                    {
+                        if (commit.Parents.Count <= 1)
+                        {
+                            PopupHost.ShowPopup(new CherryPick(_repo, [commit]));
+                        }
+                        else
+                        {
+                            var parents = new List<Models.Commit>();
+                            foreach (var sha in commit.Parents)
+                            {
+                                var parent = _commits.Find(x => x.SHA == sha);
+                                if (parent == null)
+                                    parent = new Commands.QuerySingleCommit(_repo.FullPath, sha).Result();
+
+                                if (parent != null)
+                                    parents.Add(parent);
+                            }
+
+                            PopupHost.ShowPopup(new CherryPick(_repo, commit, parents));
+                        }
+                    }
+
                    e.Handled = true;
                };
                menu.Items.Add(cherryPick);
--- a/src/ViewModels/Merge.cs
+++ b/src/ViewModels/Merge.cs
@ -54,7 +54,7 @@ namespace SourceGit.ViewModels
                return Models.MergeMode.Supported[2];
            if (config.Equals("--no-commit", StringComparison.Ordinal) || config.Equals("--no-ff --no-commit", StringComparison.Ordinal))
                return Models.MergeMode.Supported[3];
-            
+
            return Models.MergeMode.Supported[0];
        }

--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preference.cs
@ -453,6 +453,13 @@ namespace SourceGit.ViewModels
            Save();
        }

+        public void AutoRemoveInvalidNode()
+        {
+            var changed = RemoveInvalidRepositoriesRecursive(RepositoryNodes);
+            if (changed)
+                Save();
+        }
+
        public void Save()
        {
            if (_isLoading)
@ -567,6 +574,27 @@ namespace SourceGit.ViewModels
            return false;
        }

+        private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
+        {
+            bool changed = false;
+            
+            for (int i = collection.Count - 1; i >= 0; i--)
+            {
+                var node = collection[i];
+                if (node.IsInvalid)
+                {
+                    collection.RemoveAt(i);
+                    changed = true;
+                }
+                else if (!node.IsRepository)
+                {
+                    changed |= RemoveInvalidRepositoriesRecursive(node.SubNodes);
+                }
+            }
+
+            return changed;
+        }
+
        private static Preference _instance = null;
        private static bool _isLoading = false;

--- a/src/ViewModels/RenameBranch.cs
+++ b/src/ViewModels/RenameBranch.cs
@ -62,7 +62,7 @@ namespace SourceGit.ViewModels
                        _repo.Settings.Filters.Remove(oldName);
                        _repo.Settings.Filters.Add($"refs/heads/{_name}");
                    }
-                    
+
                    _repo.MarkBranchesDirtyManually();
                    _repo.SetWatcherEnabled(true);
                });
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@ -74,6 +74,16 @@ namespace SourceGit.ViewModels
            set => SetProperty(ref _selectedView, value);
        }

+        public bool EnableReflog
+        {
+            get => _enableReflog;
+            set
+            {
+                if (SetProperty(ref _enableReflog, value))
+                    Task.Run(RefreshCommits);
+            }
+        }
+
        public bool EnableFirstParentInHistories
        {
            get => _enableFirstParentInHistories;
@ -827,6 +837,8 @@ namespace SourceGit.ViewModels
            Dispatcher.UIThread.Invoke(() => _histories.IsLoading = true);

            var limits = $"-{Preference.Instance.MaxHistoryCommits} ";
+            if (_enableReflog)
+                limits += "--reflog ";
            if (_enableFirstParentInHistories)
                limits += "--first-parent ";

@ -862,7 +874,7 @@ namespace SourceGit.ViewModels
            {
                if (_settings.Filters.Count != 0)
                    Dispatcher.UIThread.Invoke(() => _settings.Filters.Clear());
-                    
+
                limits += "--exclude=refs/stash --all";
            }

@ -1829,6 +1841,16 @@ namespace SourceGit.ViewModels
                ev.Handled = true;
            };

+            var copyMessage = new MenuItem();
+            copyMessage.Header = App.Text("TagCM.CopyMessage");
+            copyMessage.Icon = App.CreateMenuIcon("Icons.Copy");
+            copyMessage.IsEnabled = !string.IsNullOrEmpty(tag.Message);
+            copyMessage.Click += (_, ev) =>
+            {
+                App.CopyText(tag.Message);
+                ev.Handled = true;
+            };
+
            var menu = new ContextMenu();
            menu.Items.Add(createBranch);
            menu.Items.Add(new MenuItem() { Header = "-" });
@ -1838,6 +1860,7 @@ namespace SourceGit.ViewModels
            menu.Items.Add(archive);
            menu.Items.Add(new MenuItem() { Header = "-" });
            menu.Items.Add(copy);
+            menu.Items.Add(copyMessage);
            return menu;
        }

@ -2045,7 +2068,31 @@ namespace SourceGit.ViewModels
                Task.Run(() =>
                {
                    var files = new Commands.QueryCurrentRevisionFiles(_fullpath).Result();
-                    Dispatcher.UIThread.Invoke(() => _revisionFiles.AddRange(files));
+                    Dispatcher.UIThread.Invoke(() =>
+                    {
+                        if (_searchCommitFilterType != 3)
+                            return;
+
+                        _revisionFiles.AddRange(files);
+
+                        if (!string.IsNullOrEmpty(_searchCommitFilter) && _searchCommitFilter.Length > 2 && _revisionFiles.Count > 0)
+                        {
+                            var suggestion = new List<string>();
+                            foreach (var file in _revisionFiles)
+                            {
+                                if (file.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) && file.Length != _searchCommitFilter.Length)
+                                {
+                                    suggestion.Add(file);
+                                    if (suggestion.Count > 100)
+                                        break;
+                                }
+                            }
+
+                            SearchCommitFilterSuggestion.Clear();
+                            SearchCommitFilterSuggestion.AddRange(suggestion);
+                            IsSearchCommitSuggestionOpen = SearchCommitFilterSuggestion.Count > 0;
+                        }
+                    });
                });
            }
        }
@ -2091,6 +2138,7 @@ namespace SourceGit.ViewModels
        private bool _isSearchCommitSuggestionOpen = false;
        private int _searchCommitFilterType = 2;
        private bool _onlySearchCommitsInCurrentBranch = false;
+        private bool _enableReflog = false;
        private bool _enableFirstParentInHistories = false;
        private string _searchCommitFilter = string.Empty;
        private List<Models.Commit> _searchedCommits = new List<Models.Commit>();
--- a/src/ViewModels/RepositoryNode.cs
+++ b/src/ViewModels/RepositoryNode.cs
@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Text.Json.Serialization;

 using CommunityToolkit.Mvvm.ComponentModel;
@ -48,6 +49,12 @@ namespace SourceGit.ViewModels
            set => SetProperty(ref _isVisible, value);
        }

+        [JsonIgnore]
+        public bool IsInvalid
+        {
+            get => _isRepository && !Directory.Exists(_id);
+        }
+
        [JsonIgnore]
        public int Depth
        {
--- a/src/ViewModels/ScanRepositories.cs
+++ b/src/ViewModels/ScanRepositories.cs
@ -56,12 +56,9 @@ namespace SourceGit.ViewModels
                            var group = FindOrCreateGroupRecursive(Preference.Instance.RepositoryNodes, relative);
                            Preference.Instance.FindOrAddNodeByRepositoryPath(f, group, false);
                        }
-                        else
-                        {
-                            // Should not happen.
-                        }
                    }

+                    Preference.Instance.AutoRemoveInvalidNode();
                    Welcome.Instance.Refresh();
                });

--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;

 using Avalonia.Controls;
@ -150,6 +151,74 @@ namespace SourceGit.ViewModels
            return menu;
        }

+        public ContextMenu MakeContextMenuForChange(Models.Change change)
+        {
+            if (change == null)
+                return null;
+
+            var diffWithMerger = new MenuItem();
+            diffWithMerger.Header = App.Text("DiffWithMerger");
+            diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
+            diffWithMerger.Click += (_, ev) =>
+            {
+                var toolType = Preference.Instance.ExternalMergeToolType;
+                var toolPath = Preference.Instance.ExternalMergeToolPath;
+                var opt = new Models.DiffOption($"{_selectedStash.SHA}^", _selectedStash.SHA, change);
+
+                Task.Run(() => Commands.MergeTool.OpenForDiff(_repo.FullPath, toolType, toolPath, opt));
+                ev.Handled = true;
+            };
+
+            var fullPath = Path.Combine(_repo.FullPath, change.Path);
+            var explore = new MenuItem();
+            explore.Header = App.Text("RevealFile");
+            explore.Icon = App.CreateMenuIcon("Icons.Explore");
+            explore.IsEnabled = File.Exists(fullPath);
+            explore.Click += (_, ev) =>
+            {
+                Native.OS.OpenInFileManager(fullPath, true);
+                ev.Handled = true;
+            };
+
+            var resetToThisRevision = new MenuItem();
+            resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision");
+            resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout");
+            resetToThisRevision.Click += (_, ev) =>
+            {
+                new Commands.Checkout(_repo.FullPath).FileWithRevision(change.Path, $"{_selectedStash.SHA}");
+                ev.Handled = true;
+            };
+
+            var copyPath = new MenuItem();
+            copyPath.Header = App.Text("CopyPath");
+            copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
+            copyPath.Click += (_, ev) =>
+            {
+                App.CopyText(change.Path);
+                ev.Handled = true;
+            };
+
+            var copyFileName = new MenuItem();
+            copyFileName.Header = App.Text("CopyFileName");
+            copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
+            copyFileName.Click += (_, e) =>
+            {
+                App.CopyText(Path.GetFileName(change.Path));
+                e.Handled = true;
+            };
+
+            var menu = new ContextMenu();
+            menu.Items.Add(diffWithMerger);
+            menu.Items.Add(explore);
+            menu.Items.Add(new MenuItem { Header = "-" });
+            menu.Items.Add(resetToThisRevision);
+            menu.Items.Add(new MenuItem { Header = "-" });
+            menu.Items.Add(copyPath);
+            menu.Items.Add(copyFileName);
+
+            return menu;
+        }
+
        public void Clear()
        {
            if (PopupHost.CanCreatePopup())
--- a/src/ViewModels/TagCollection.cs
+++ b/src/ViewModels/TagCollection.cs
@ -12,6 +12,11 @@ namespace SourceGit.ViewModels
        public Models.Tag Tag { get; private set; } = null;
        public List<TagTreeNode> Children { get; private set; } = [];

+        public object ToolTip
+        {
+            get => Tag?.Message;
+        }
+
        public bool IsFolder
        {
            get => Tag == null;
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@ -345,7 +345,7 @@ namespace SourceGit.ViewModels
            _repo.SetWatcherEnabled(false);
            if (changes.Count == _unstaged.Count)
            {
-                await Task.Run(() => new Commands.Add(_repo.FullPath).Exec());
+                await Task.Run(() => new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Exec());
            }
            else
            {
@ -1202,7 +1202,7 @@ namespace SourceGit.ViewModels
        {
            if (_useAmend)
                return new Commands.QueryStagedChangesWithAmend(_repo.FullPath).Result();
-            
+
            var rs = new List<Models.Change>();
            foreach (var c in _cached)
            {
@ -1316,7 +1316,7 @@ namespace SourceGit.ViewModels
            {
                var succ = true;
                if (autoStage && _unstaged.Count > 0)
-                    succ = new Commands.Add(_repo.FullPath).Exec();
+                    succ = new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Exec();

                if (succ)
                    succ = new Commands.Commit(_repo.FullPath, _commitMessage, _useAmend).Exec();
--- a/src/Views/Avatar.cs
+++ b/src/Views/Avatar.cs
@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;

 using Avalonia;
@ -92,8 +93,8 @@ namespace SourceGit.Views
            if (avatar.User == null)
                return;

-            var placeholder = string.IsNullOrWhiteSpace(avatar.User.Name) ? "?" : avatar.User.Name.Substring(0, 1);
-            var chars = placeholder.ToCharArray();
+            var fallback = GetFallbackString(avatar.User.Name);
+            var chars = fallback.ToCharArray();
            var sum = 0;
            foreach (var c in chars)
                sum += Math.Abs(c);
@ -105,11 +106,9 @@ namespace SourceGit.Views
                EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),
            };

-            var fontFamily = avatar.FindResource("Fonts.Monospace") as FontFamily;
-            var typeface = new Typeface(fontFamily);
-
+            var typeface = new Typeface("fonts:SourceGit#JetBrains Mono");
            avatar._fallbackLabel = new FormattedText(
-                placeholder,
+                fallback,
                CultureInfo.CurrentCulture,
                FlowDirection.LeftToRight,
                typeface,
@ -119,6 +118,23 @@ namespace SourceGit.Views
            avatar.InvalidateVisual();
        }

+        private static string GetFallbackString(string name)
+        {
+            if (string.IsNullOrWhiteSpace(name))
+                return "?";
+
+            var parts = name.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+            var chars = new List<char>();
+            foreach (var part in parts)
+                chars.Add(part[0]);
+
+            if (chars.Count >= 2)
+                return string.Format("{0}{1}", chars[0], chars[^1]);
+            if (chars.Count == 1)
+                return string.Format("{0}", chars[0]);
+            return name.Substring(0, 1);
+        }
+
        private FormattedText _fallbackLabel = null;
        private LinearGradientBrush _fallbackBrush = null;
    }
--- a/src/Views/BranchTree.axaml
+++ b/src/Views/BranchTree.axaml
@ -33,49 +33,49 @@
              ColumnDefinitions="16,*"
              ToolTip.Tip="{Binding Tooltip}">

-        <!-- Tree Expander -->
-        <v:BranchTreeNodeToggleButton Grid.Column="0"
-                                      Classes="tree_expander"
-                                      Focusable="False"
-                                      HorizontalAlignment="Center"
-                                      IsChecked="{Binding IsExpanded, Mode=OneWay}"
-                                      IsVisible="{Binding !IsBranch}"/>
+          <!-- Tree Expander -->
+          <v:BranchTreeNodeToggleButton Grid.Column="0"
+                                        Classes="tree_expander"
+                                        Focusable="False"
+                                        HorizontalAlignment="Center"
+                                        IsChecked="{Binding IsExpanded, Mode=OneWay}"
+                                        IsVisible="{Binding !IsBranch}"/>

-        <!-- Content Area (allows double-click) -->
-        <Grid Grid.Column="1"
-              Background="Transparent"
-              ColumnDefinitions="18,*,Auto,Auto"
-              DoubleTapped="OnDoubleTappedBranchNode">
+          <!-- Content Area (allows double-click) -->
+          <Grid Grid.Column="1"
+                Background="Transparent"
+                ColumnDefinitions="18,*,Auto,Auto"
+                DoubleTapped="OnDoubleTappedBranchNode">

-          <!-- Icon -->
-          <v:BranchTreeNodeIcon Grid.Column="0"
-                                Node="{Binding}"
-                                IsExpanded="{Binding IsExpanded}"/>
+            <!-- Icon -->
+            <v:BranchTreeNodeIcon Grid.Column="0"
+                                  Node="{Binding}"
+                                  IsExpanded="{Binding IsExpanded}"/>

-          <!-- Name -->
-          <TextBlock Grid.Column="1"
-                     Text="{Binding Name}"
-                     Classes="primary"
-                     FontWeight="{Binding NameFontWeight}"
-                     TextTrimming="CharacterEllipsis"/>
+            <!-- Name -->
+            <TextBlock Grid.Column="1"
+                       Text="{Binding Name}"
+                       Classes="primary"
+                       FontWeight="{Binding NameFontWeight}"
+                       TextTrimming="CharacterEllipsis"/>

-          <!-- Tracking status -->
-          <v:BranchTreeNodeTrackStatusPresenter Grid.Column="2"
-                                                VerticalAlignment="Center"
-                                                FontFamily="{DynamicResource Fonts.Monospace}"
-                                                FontSize="10"
-                                                Foreground="{DynamicResource Brush.BadgeFG}"
-                                                Background="{DynamicResource Brush.Badge}"/>
+            <!-- Tracking status -->
+            <v:BranchTreeNodeTrackStatusPresenter Grid.Column="2"
+                                                  VerticalAlignment="Center"
+                                                  FontFamily="{DynamicResource Fonts.Monospace}"
+                                                  FontSize="10"
+                                                  Foreground="{DynamicResource Brush.BadgeFG}"
+                                                  Background="{DynamicResource Brush.Badge}"/>

-          <!-- Filter Toggle Button -->
-          <ToggleButton Grid.Column="3"
-                        Classes="filter"
-                        Margin="0,0,8,0"
-                        Background="Transparent"
-                        IsVisible="{Binding IsBranch}"
-                        IsChecked="{Binding IsFiltered}"
-                        Click="OnToggleFilterClicked"
-                        ToolTip.Tip="{DynamicResource Text.Filter}"/>
+            <!-- Filter Toggle Button -->
+            <ToggleButton Grid.Column="3"
+                          Classes="filter"
+                          Margin="0,0,8,0"
+                          Background="Transparent"
+                          IsVisible="{Binding IsBranch}"
+                          IsChecked="{Binding IsFiltered}"
+                          Click="OnToggleFilterClicked"
+                          ToolTip.Tip="{DynamicResource Text.Filter}"/>
          </Grid>
        </Grid>
      </DataTemplate>
--- a/src/Views/BranchTree.axaml.cs
+++ b/src/Views/BranchTree.axaml.cs
@ -52,7 +52,7 @@ namespace SourceGit.Views

            if (node.Backend is Models.Remote)
            {
-                CreateContent(new Thickness(0, 2, 0, 0), "Icons.Remote");
+                CreateContent(new Thickness(0, 0, 0, 0), "Icons.Remote");
            }
            else if (node.Backend is Models.Branch branch)
            {
--- a/src/Views/ChangeStatusIcon.cs
+++ b/src/Views/ChangeStatusIcon.cs
@ -62,7 +62,7 @@ namespace SourceGit.Views
        ];

        private static readonly string[] INDICATOR = ["?", "±", "T", "+", "−", "➜", "❏", "U", "★"];
-        private static readonly string[] TIPS = ["Unknown", "Modified", "Type Changed", "Added", "Deleted", "Renamed", "Copied", "Unmerged", "Untracked" ];
+        private static readonly string[] TIPS = ["Unknown", "Modified", "Type Changed", "Added", "Deleted", "Renamed", "Copied", "Unmerged", "Untracked"];

        public static readonly StyledProperty<bool> IsUnstagedChangeProperty =
            AvaloniaProperty.Register<ChangeStatusIcon, bool>(nameof(IsUnstagedChange));
@ -142,7 +142,7 @@ namespace SourceGit.Views
                    ToolTip.SetTip(this, c.IsConflit ? "Conflict" : TIPS[(int)c.WorkTree]);
                else
                    ToolTip.SetTip(this, TIPS[(int)c.Index]);
-                
+
                InvalidateVisual();
            }
        }
--- a/src/Views/CherryPick.axaml
+++ b/src/Views/CherryPick.axaml
@ -12,17 +12,11 @@
    <TextBlock FontSize="18"
               Classes="bold"
               Text="{DynamicResource Text.CherryPick}"/>
-    <Grid Margin="0,16,0,0" ColumnDefinitions="100,*">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto"/>
-        <RowDefinition Height="32"/>
-      </Grid.RowDefinitions>
-      
+    <Grid Margin="0,16,0,0" RowDefinitions="Auto,Auto,32,32" ColumnDefinitions="100,*">      
      <TextBlock Grid.Row="0" Grid.Column="0"
-                 HorizontalAlignment="Right" VerticalAlignment="Top"
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
                 Margin="0,0,8,0"
                 Text="{DynamicResource Text.CherryPick.Commit}"/>
-
      <ListBox Grid.Row="0" Grid.Column="1"
               MinHeight="32" MaxHeight="100"
               ItemsSource="{Binding Targets}"
@ -56,11 +50,47 @@
            </Grid>
          </DataTemplate>
        </ListBox.ItemTemplate>
-      </ListBox>      
+      </ListBox>

-      <CheckBox Grid.Row="1" Grid.Column="1"
+      <TextBlock Grid.Row="1" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.CherryPick.Mainline}"
+                 IsVisible="{Binding IsMergeCommit}"/>
+      <Grid Grid.Row="1" Grid.Column="1" Height="32" ColumnDefinitions="*,24" IsVisible="{Binding IsMergeCommit}">
+        <ComboBox Grid.Column="0"
+                  Height="28" Padding="4,0"
+                  VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                  ItemsSource="{Binding ParentsForMergeCommit}"
+                  SelectedIndex="{Binding MainlineForMergeCommit, Mode=TwoWay}">
+          <ComboBox.ItemTemplate>
+            <DataTemplate x:DataType="{x:Type m:Commit}">
+              <Grid ColumnDefinitions="Auto,*">
+                <TextBlock Grid.Column="0" FontFamily="{DynamicResource Fonts.Monospace}" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="6,0,4,0"/>
+                <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding Subject}" TextTrimming="CharacterEllipsis"/>
+              </Grid>
+            </DataTemplate>
+          </ComboBox.ItemTemplate>
+        </ComboBox>
+
+        <Border Grid.Column="1" 
+                Background="Transparent" 
+                ToolTip.Tip="{DynamicResource Text.CherryPick.Mainline.Tips}">
+          <Path Grid.Column="1"
+                Width="14" Height="14"
+                Data="{StaticResource Icons.Info}"/>
+        </Border>
+      </Grid>
+      
+      <CheckBox Grid.Row="2" Grid.Column="1"
                Content="{DynamicResource Text.CherryPick.CommitChanges}"
                IsChecked="{Binding AutoCommit, Mode=TwoWay}"/>
+
+      <CheckBox Grid.Row="3" Grid.Column="1"
+                Content="{DynamicResource Text.CherryPick.AppendSourceToMessage}"
+                IsChecked="{Binding AppendSourceToMessage, Mode=TwoWay}"
+                IsEnabled="{Binding AutoCommit}"
+                ToolTip.Tip="-x"/>
    </Grid>
  </StackPanel>
 </UserControl>
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@ -98,16 +98,12 @@
          <!-- REFS -->
          <TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Refs}" IsVisible="{Binding HasDecorators}"/>
          <Border Grid.Row="2" Grid.Column="1" Margin="12,0,0,0" Height="24" IsVisible="{Binding HasDecorators}">
-            <v:CommitRefsPresenter IconBackground="{DynamicResource Brush.DecoratorIconBG}"
-                                   IconForeground="{DynamicResource Brush.DecoratorIcon}"
-                                   BranchNameBackground="{DynamicResource Brush.DecoratorBranch}"
-                                   HeadBranchNameBackground="{DynamicResource Brush.DecoratorHead}"
-                                   TagNameBackground="{DynamicResource Brush.DecoratorTag}"
-                                   LabelForeground="{DynamicResource Brush.DecoratorFG}"
+            <v:CommitRefsPresenter TagBackground="{DynamicResource Brush.DecoratorTag}"
+                                   Foreground="{DynamicResource Brush.FG1}"
                                   FontFamily="{DynamicResource Fonts.Primary}"
                                   FontSize="11"
                                   VerticalAlignment="Center"
-                                   Refs="{Binding Decorators}"/>
+                                   UseGraphColor="False"/>
          </Border>
          
          <!-- Messages -->
--- a/src/Views/CommitRefsPresenter.cs
+++ b/src/Views/CommitRefsPresenter.cs
@ -14,16 +14,9 @@ namespace SourceGit.Views
        {
            public Geometry Icon { get; set; } = null;
            public FormattedText Label { get; set; } = null;
-            public IBrush LabelBG { get; set; } = null;
-        }
-
-        public static readonly StyledProperty<List<Models.Decorator>> RefsProperty =
-            AvaloniaProperty.Register<CommitRefsPresenter, List<Models.Decorator>>(nameof(Refs));
-
-        public List<Models.Decorator> Refs
-        {
-            get => GetValue(RefsProperty);
-            set => SetValue(RefsProperty, value);
+            public IBrush Brush { get; set; } = null;
+            public bool IsHead { get; set; } = false;
+            public double Width { get; set; } = 0.0;
        }

        public static readonly StyledProperty<FontFamily> FontFamilyProperty =
@ -44,58 +37,40 @@ namespace SourceGit.Views
            set => SetValue(FontSizeProperty, value);
        }

-        public static readonly StyledProperty<IBrush> IconBackgroundProperty =
-            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(IconBackground), Brushes.White);
+        public static readonly StyledProperty<IBrush> BackgroundProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(Background), null);

-        public IBrush IconBackground
+        public IBrush Background
        {
-            get => GetValue(IconBackgroundProperty);
-            set => SetValue(IconBackgroundProperty, value);
+            get => GetValue(BackgroundProperty);
+            set => SetValue(BackgroundProperty, value);
        }

-        public static readonly StyledProperty<IBrush> IconForegroundProperty =
-            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(IconForeground), Brushes.White);
+        public static readonly StyledProperty<IBrush> ForegroundProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(Foreground), Brushes.White);

-        public IBrush IconForeground
+        public IBrush Foreground
        {
-            get => GetValue(IconForegroundProperty);
-            set => SetValue(IconForegroundProperty, value);
+            get => GetValue(ForegroundProperty);
+            set => SetValue(ForegroundProperty, value);
        }

-        public static readonly StyledProperty<IBrush> LabelForegroundProperty =
-            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(LabelForeground), Brushes.White);
+        public static readonly StyledProperty<bool> UseGraphColorProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, bool>(nameof(UseGraphColor), false);

-        public IBrush LabelForeground
+        public bool UseGraphColor
        {
-            get => GetValue(LabelForegroundProperty);
-            set => SetValue(LabelForegroundProperty, value);
+            get => GetValue(UseGraphColorProperty);
+            set => SetValue(UseGraphColorProperty, value);
        }

-        public static readonly StyledProperty<IBrush> BranchNameBackgroundProperty =
-            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(BranchNameBackground), Brushes.White);
+        public static readonly StyledProperty<IBrush> TagBackgroundProperty =
+            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(TagBackground), Brushes.White);

-        public IBrush BranchNameBackground
+        public IBrush TagBackground
        {
-            get => GetValue(BranchNameBackgroundProperty);
-            set => SetValue(BranchNameBackgroundProperty, value);
-        }
-
-        public static readonly StyledProperty<IBrush> HeadBranchNameBackgroundProperty =
-            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(HeadBranchNameBackground), Brushes.White);
-
-        public IBrush HeadBranchNameBackground
-        {
-            get => GetValue(HeadBranchNameBackgroundProperty);
-            set => SetValue(HeadBranchNameBackgroundProperty, value);
-        }
-
-        public static readonly StyledProperty<IBrush> TagNameBackgroundProperty =
-            AvaloniaProperty.Register<CommitRefsPresenter, IBrush>(nameof(TagNameBackground), Brushes.White);
-
-        public IBrush TagNameBackground
-        {
-            get => GetValue(TagNameBackgroundProperty);
-            set => SetValue(TagNameBackgroundProperty, value);
+            get => GetValue(TagBackgroundProperty);
+            set => SetValue(TagBackgroundProperty, value);
        }

        static CommitRefsPresenter()
@ -103,14 +78,11 @@ namespace SourceGit.Views
            AffectsMeasure<CommitRefsPresenter>(
                FontFamilyProperty,
                FontSizeProperty,
-                LabelForegroundProperty,
-                RefsProperty);
+                ForegroundProperty,
+                TagBackgroundProperty);

            AffectsRender<CommitRefsPresenter>(
-                IconBackgroundProperty,
-                IconForegroundProperty,
-                BranchNameBackgroundProperty,
-                TagNameBackgroundProperty);
+                BackgroundProperty);
        }

        public override void Render(DrawingContext context)
@ -118,39 +90,72 @@ namespace SourceGit.Views
            if (_items.Count == 0)
                return;

-            var iconFG = IconForeground;
-            var iconBG = IconBackground;
-            var x = 0.0;
-
+            var useGraphColor = UseGraphColor;
+            var fg = Foreground;
+            var bg = Background;
+            var x = 1.0;
            foreach (var item in _items)
            {
                var iconRect = new RoundedRect(new Rect(x, 0, 16, 16), new CornerRadius(2, 0, 0, 2));
-                var labelRect = new RoundedRect(new Rect(x + 16, 0, item.Label.Width + 8, 16), new CornerRadius(0, 2, 2, 0));
+                var entireRect = new RoundedRect(new Rect(x, 0, item.Width, 16), new CornerRadius(2));

-                context.DrawRectangle(iconBG, null, iconRect);
-                context.DrawRectangle(item.LabelBG, null, labelRect);
-                context.DrawText(item.Label, new Point(x + 20, 8.0 - item.Label.Height * 0.5));
+                if (item.IsHead)
+                {
+                    if (useGraphColor)
+                    {
+                        if (bg != null)
+                            context.DrawRectangle(bg, null, entireRect);

-                using (context.PushTransform(Matrix.CreateTranslation(x + 4, 4)))
-                    context.DrawGeometry(iconFG, null, item.Icon);
+                        using (context.PushOpacity(.6))
+                            context.DrawRectangle(item.Brush, null, entireRect);
+                    }

-                x += item.Label.Width + 16 + 8 + 4;
+                    context.DrawText(item.Label, new Point(x + 16, 8.0 - item.Label.Height * 0.5));
+                }
+                else
+                {
+                    if (bg != null)
+                        context.DrawRectangle(bg, null, entireRect);
+
+                    var labelRect = new RoundedRect(new Rect(x + 16, 0, item.Label.Width + 8, 16), new CornerRadius(0, 2, 2, 0));
+                    using (context.PushOpacity(.2))
+                        context.DrawRectangle(item.Brush, null, labelRect);
+
+                    context.DrawLine(new Pen(item.Brush), new Point(x + 16, 0), new Point(x + 16, 16));
+                    context.DrawText(item.Label, new Point(x + 20, 8.0 - item.Label.Height * 0.5));
+                }
+
+                context.DrawRectangle(null, new Pen(item.Brush), entireRect);
+
+                using (context.PushTransform(Matrix.CreateTranslation(x + 3, 3)))
+                    context.DrawGeometry(fg, null, item.Icon);
+
+                x += item.Width + 4;
            }
        }

+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            base.OnDataContextChanged(e);
+            InvalidateMeasure();
+        }
+
        protected override Size MeasureOverride(Size availableSize)
        {
            _items.Clear();

-            var refs = Refs;
+            var commit = DataContext as Models.Commit;
+            if (commit == null)
+                return new Size(0, 0);
+
+            var refs = commit.Decorators;
            if (refs != null && refs.Count > 0)
            {
                var typeface = new Typeface(FontFamily);
                var typefaceBold = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Bold);
-                var labelFG = LabelForeground;
-                var branchBG = BranchNameBackground;
-                var headBG = HeadBranchNameBackground;
-                var tagBG = TagNameBackground;
+                var fg = Foreground;
+                var normalBG = UseGraphColor ? commit.Brush : Brushes.Gray;
+                var tagBG = TagBackground;
                var labelSize = FontSize;
                var requiredWidth = 0.0;

@ -164,28 +169,31 @@ namespace SourceGit.Views
                        CultureInfo.CurrentCulture,
                        FlowDirection.LeftToRight,
                        isHead ? typefaceBold : typeface,
-                        labelSize,
-                        labelFG);
+                        isHead ? labelSize + 1 : labelSize,
+                        fg);
+
+                    var item = new RenderItem()
+                    {
+                        Label = label,
+                        Brush = normalBG,
+                        IsHead = isHead
+                    };

-                    var item = new RenderItem() { Label = label };
                    StreamGeometry geo;
                    switch (decorator.Type)
                    {
                        case Models.DecoratorType.CurrentBranchHead:
                        case Models.DecoratorType.CurrentCommitHead:
-                            item.LabelBG = headBG;
-                            geo = this.FindResource("Icons.Check") as StreamGeometry;
+                            geo = this.FindResource("Icons.Head") as StreamGeometry;
                            break;
                        case Models.DecoratorType.RemoteBranchHead:
-                            item.LabelBG = branchBG;
                            geo = this.FindResource("Icons.Remote") as StreamGeometry;
                            break;
                        case Models.DecoratorType.Tag:
-                            item.LabelBG = tagBG;
+                            item.Brush = tagBG;
                            geo = this.FindResource("Icons.Tag") as StreamGeometry;
                            break;
                        default:
-                            item.LabelBG = branchBG;
                            geo = this.FindResource("Icons.Branch") as StreamGeometry;
                            break;
                    }
@ -193,7 +201,7 @@ namespace SourceGit.Views
                    var drawGeo = geo!.Clone();
                    var iconBounds = drawGeo.Bounds;
                    var translation = Matrix.CreateTranslation(-(Vector)iconBounds.Position);
-                    var scale = Math.Min(8.0 / iconBounds.Width, 8.0 / iconBounds.Height);
+                    var scale = Math.Min(10.0 / iconBounds.Width, 10.0 / iconBounds.Height);
                    var transform = translation * Matrix.CreateScale(scale, scale);
                    if (drawGeo.Transform == null || drawGeo.Transform.Value == Matrix.Identity)
                        drawGeo.Transform = new MatrixTransform(transform);
@ -201,12 +209,14 @@ namespace SourceGit.Views
                        drawGeo.Transform = new MatrixTransform(drawGeo.Transform.Value * transform);

                    item.Icon = drawGeo;
+                    item.Width = 16 + (isHead ? 0 : 4) + label.Width + 4;
                    _items.Add(item);
-                    requiredWidth += label.Width + 16 /* icon */ + 8 /* label margin */ + 4 /* item right margin */;
+
+                    requiredWidth += item.Width + 4;
                }

                InvalidateVisual();
-                return new Size(requiredWidth, 16);
+                return new Size(requiredWidth + 2, 16);
            }

            InvalidateVisual();
--- a/src/Views/ConventionalCommitMessageBuilder.axaml
+++ b/src/Views/ConventionalCommitMessageBuilder.axaml
@ -0,0 +1,146 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:m="using:SourceGit.Models"
+                    xmlns:vm="using:SourceGit.ViewModels"
+                    xmlns:v="using:SourceGit.Views"
+                    xmlns:c="using:SourceGit.Converters"
+                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+                    x:Class="SourceGit.Views.ConventionalCommitMessageBuilder"
+                    x:DataType="vm:ConventionalCommitMessageBuilder"
+                    x:Name="ThisControl"
+                    Icon="/App.ico"
+                    Title="{DynamicResource Text.ConventionalCommit}"
+                    Width="600"
+                    SizeToContent="Height"
+                    CanResize="False"
+                    WindowStartupLocation="CenterOwner">
+  <Grid RowDefinitions="Auto,Auto,Auto" MinWidth="494">
+    <!-- TitleBar -->
+    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Grid.Column="0" Grid.ColumnSpan="3"
+              Background="{DynamicResource Brush.TitleBar}"
+              BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+              PointerPressed="BeginMoveWindow"/>
+
+      <Path Grid.Column="0"
+            Width="14" Height="14"
+            Data="{StaticResource Icons.CommitMessageGenerator}"
+            Margin="10,0,0,0"
+            IsVisible="{OnPlatform True, macOS=False}"/>
+
+      <v:CaptionButtonsMacOS Grid.Column="0"
+                             Margin="0,2,0,0"
+                             IsCloseButtonOnly="True"
+                             IsVisible="{OnPlatform False, macOS=True}"/>
+
+      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
+                 Classes="bold"
+                 Text="{DynamicResource Text.ConventionalCommit}"
+                 HorizontalAlignment="Center" VerticalAlignment="Center"
+                 IsHitTestVisible="False"/>
+
+      <v:CaptionButtons Grid.Column="2"
+                        IsCloseButtonOnly="True"
+                        IsVisible="{OnPlatform True, macOS=False}"/>
+    </Grid>
+
+    <!-- Body -->
+    <Grid Grid.Row="1" Margin="16,8" RowDefinitions="32,32,32,100,100,32" ColumnDefinitions="Auto,*">
+      <TextBlock Grid.Row="0" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Top"
+                 Margin="0,6,8,0"
+                 Text="{DynamicResource Text.ConventionalCommit.Type}"/>
+      <ComboBox Grid.Row="0" Grid.Column="1"
+                Height="28" Padding="8,0"
+                VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                ItemsSource="{Binding Source={x:Static m:ConventionalCommitType.Supported}}"
+                SelectedItem="{Binding Type, Mode=TwoWay}">
+        <ComboBox.ItemTemplate>
+          <DataTemplate x:DataType="{x:Type m:ConventionalCommitType}">
+            <Grid Height="20" ColumnDefinitions="64,Auto" VerticalAlignment="Center">
+              <TextBlock Grid.Column="0" Text="{Binding Type}"/>
+              <TextBlock Grid.Column="1" Text="{Binding Description}" Foreground="{DynamicResource Brush.FG2}"/>
+            </Grid>
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+
+      <TextBlock Grid.Row="1" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Top"
+                 Margin="0,6,8,0"
+                 Text="{DynamicResource Text.ConventionalCommit.Scope}"/>
+      <TextBox Grid.Row="1" Grid.Column="1"
+               Height="26"
+               VerticalAlignment="Center"
+               CornerRadius="2"
+               Watermark="{DynamicResource Text.Optional}"
+               Text="{Binding Scope, Mode=TwoWay}"/>
+
+      <TextBlock Grid.Row="2" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Top"
+                 Margin="0,6,8,0"
+                 Text="{DynamicResource Text.ConventionalCommit.ShortDescription}"/>
+      <TextBox Grid.Row="2" Grid.Column="1"
+               Height="26"
+               VerticalAlignment="Center"
+               CornerRadius="2"
+               Text="{Binding Description, Mode=TwoWay}"/>
+
+      <TextBlock Grid.Row="3" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Top"
+                 Margin="0,6,8,0"
+                 Text="{DynamicResource Text.ConventionalCommit.Detail}"/>
+      <TextBox Grid.Row="3" Grid.Column="1"
+               Height="96"
+               AcceptsReturn="True"
+               AcceptsTab="True"
+               TextWrapping="Wrap"
+               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+               ScrollViewer.VerticalScrollBarVisibility="Auto"
+               VerticalAlignment="Center"
+               VerticalContentAlignment="Top"
+               CornerRadius="2"
+               Watermark="{DynamicResource Text.Optional}"
+               Text="{Binding Detail, Mode=TwoWay}"/>
+
+      <TextBlock Grid.Row="4" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Top"
+                 Margin="0,6,8,0"
+                 Text="{DynamicResource Text.ConventionalCommit.BreakingChanges}"/>
+      <TextBox Grid.Row="4" Grid.Column="1"
+               Height="96"
+               AcceptsReturn="True"
+               AcceptsTab="True"
+               TextWrapping="Wrap"
+               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+               ScrollViewer.VerticalScrollBarVisibility="Auto"
+               VerticalAlignment="Center"
+               VerticalContentAlignment="Top"
+               CornerRadius="2"
+               Watermark="{DynamicResource Text.Optional}"
+               Text="{Binding BreakingChanges, Mode=TwoWay}"/>
+
+      <TextBlock Grid.Row="5" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Top"
+                 Margin="0,6,8,0"
+                 Text="{DynamicResource Text.ConventionalCommit.ClosedIssue}"/>
+      <TextBox Grid.Row="5" Grid.Column="1"
+               Height="26"
+               VerticalAlignment="Center"
+               CornerRadius="2"
+               Watermark="{DynamicResource Text.Optional}"
+               Text="{Binding ClosedIssue, Mode=TwoWay}"/>
+    </Grid>
+
+    <!-- Apply Button -->
+    <Button Grid.Row="2"
+            Classes="flat primary"
+            Height="32" Width="80"
+            Margin="0,8,0,16"
+            HorizontalAlignment="Center"
+            Content="{DynamicResource Text.Sure}"
+            Click="OnApplyClicked"/>
+  </Grid>
+</v:ChromelessWindow>
--- a/src/Views/ConventionalCommitMessageBuilder.axaml.cs
+++ b/src/Views/ConventionalCommitMessageBuilder.axaml.cs
@ -0,0 +1,29 @@
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace SourceGit.Views
+{
+    public partial class ConventionalCommitMessageBuilder : ChromelessWindow
+    {
+        public ConventionalCommitMessageBuilder()
+        {
+            InitializeComponent();
+        }
+
+        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
+        {
+            BeginMoveDrag(e);
+        }
+
+        private void OnApplyClicked(object _, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.ConventionalCommitMessageBuilder builder)
+            {
+                if (builder.Apply())
+                    Close();
+            }
+
+            e.Handled = true;
+        }
+    }
+}
--- a/src/Views/DeleteRemote.axaml
+++ b/src/Views/DeleteRemote.axaml
@ -12,7 +12,7 @@
               Text="{DynamicResource Text.DeleteRemote}"/>
    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
      <TextBlock Text="{DynamicResource Text.DeleteRemote.Remote}"/>
-      <Path Width="14" Height="14" Margin="8,6,8,0" Data="{StaticResource Icons.Remote}"/>
+      <Path Width="14" Height="14" Margin="8,2,8,0" Data="{StaticResource Icons.Remote}"/>
      <TextBlock Text="{Binding Remote.Name}"/>
    </StackPanel>
  </StackPanel>
--- a/src/Views/Fetch.axaml
+++ b/src/Views/Fetch.axaml
@ -25,7 +25,7 @@
        <ComboBox.ItemTemplate>
          <DataTemplate x:DataType="{x:Type m:Remote}">
            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
+              <Path Margin="0,2,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
              <TextBlock Text="{Binding Name}"/>
            </StackPanel>
          </DataTemplate>
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@ -138,16 +138,13 @@
                                               VerticalAlignment="Center"/>

                      <v:CommitRefsPresenter Grid.Column="1"
-                                             IconBackground="{DynamicResource Brush.DecoratorIconBG}"
-                                             IconForeground="{DynamicResource Brush.DecoratorIcon}"
-                                             BranchNameBackground="{DynamicResource Brush.DecoratorBranch}"
-                                             HeadBranchNameBackground="{DynamicResource Brush.DecoratorHead}"
-                                             TagNameBackground="{DynamicResource Brush.DecoratorTag}"
-                                             LabelForeground="{DynamicResource Brush.DecoratorFG}"
+                                             Background="{DynamicResource Brush.Contents}"
+                                             TagBackground="{DynamicResource Brush.DecoratorTag}"
+                                             Foreground="{DynamicResource Brush.FG1}"
                                             FontFamily="{DynamicResource Fonts.Primary}"
                                             FontSize="11"
                                             VerticalAlignment="Center"
-                                             Refs="{Binding Decorators}"/>
+                                             UseGraphColor="True"/>

                      <v:CommitSubjectPresenter Grid.Column="2"
                                                Classes="primary"
@ -219,20 +216,23 @@
                  HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                  Background="{DynamicResource Brush.Window}"
                  BorderBrush="{DynamicResource Brush.Border0}"/>
+    
+    <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3">
+      <Grid IsVisible="{Binding DetailContext, Converter={x:Static ObjectConverters.IsNull}}">
+        <Path Width="128" Height="128"
+              Data="{StaticResource Icons.Detail}"
+              HorizontalAlignment="Center"
+              Fill="{DynamicResource Brush.FG2}"/>

-    <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3">
-      <ContentControl>
-        <ContentControl.Content>
-          <Binding Path="DetailContext">
-            <Binding.TargetNullValue>
-              <Path Width="128" Height="128"
-                    Data="{StaticResource Icons.Detail}"
-                    HorizontalAlignment="Center"
-                    Fill="{DynamicResource Brush.FG2}"/>
-            </Binding.TargetNullValue>
-          </Binding>
-        </ContentControl.Content>
-        
+        <StackPanel Margin="0,8" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom">
+          <Path Width="12" Height="12" VerticalAlignment="Center" Data="{StaticResource Icons.Info}" Fill="{DynamicResource Brush.FG2}"/>
+          <TextBlock Margin="4,0" Text="{DynamicResource Text.Histories.Tips.Prefix}" FontWeight="Bold" Foreground="{DynamicResource Brush.FG2}"/>
+          <TextBlock Text="{DynamicResource Text.Histories.Tips}" Foreground="{DynamicResource Brush.FG2}" IsVisible="{OnPlatform True, macOS=False}"/>
+          <TextBlock Text="{DynamicResource Text.Histories.Tips.MacOS}" Foreground="{DynamicResource Brush.FG2}" IsVisible="{OnPlatform False, macOS=True}"/>
+        </StackPanel>
+      </Grid>
+      
+      <ContentControl Content="{Binding DetailContext}">
        <ContentControl.DataTemplates>
          <DataTemplate DataType="vm:CommitDetail">
            <v:CommitDetail/>
@ -258,6 +258,6 @@
          </DataTemplate>
        </ContentControl.DataTemplates>
      </ContentControl>
-    </Border>
+    </Grid>
  </v:LayoutableGrid>
 </UserControl>
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.RegularExpressions;

 using Avalonia;
 using Avalonia.Collections;
@ -155,7 +156,7 @@ namespace SourceGit.Views
        private Status _status = Status.Normal;
    }

-    public class CommitSubjectPresenter : TextBlock
+    public partial class CommitSubjectPresenter : TextBlock
    {
        public static readonly StyledProperty<string> SubjectProperty =
            AvaloniaProperty.Register<CommitSubjectPresenter, string>(nameof(Subject));
@ -191,6 +192,21 @@ namespace SourceGit.Views
                if (string.IsNullOrEmpty(subject))
                    return;

+                var offset = 0;
+                var keywordMatch = REG_KEYWORD_FORMAT1().Match(subject);
+                if (!keywordMatch.Success)
+                    keywordMatch = REG_KEYWORD_FORMAT2().Match(subject);
+
+                if (keywordMatch.Success)
+                {
+                    var keyword = new Run(subject.Substring(0, keywordMatch.Length));
+                    keyword.FontWeight = FontWeight.Bold;
+                    Inlines.Add(keyword);
+
+                    offset = keywordMatch.Length;
+                    subject = subject.Substring(offset);
+                }
+
                var rules = IssueTrackerRules;
                if (rules == null || rules.Count == 0)
                {
@ -223,6 +239,7 @@ namespace SourceGit.Views
                    inlines.Add(link);

                    pos = match.Start + match.Length;
+                    match.Start += offset; // Because we use this index of whole subject to detect mouse event.
                }

                if (pos < subject.Length)
@ -288,6 +305,12 @@ namespace SourceGit.Views
            }
        }

+        [GeneratedRegex(@"^\[[\w\s]+\]")]
+        private static partial Regex REG_KEYWORD_FORMAT1();
+
+        [GeneratedRegex(@"^\w+([\<\(][\w\s_\-\*,]+[\>\)])?\s?:\s")]
+        private static partial Regex REG_KEYWORD_FORMAT2();
+
        private List<Models.Hyperlink> _matches = null;
        private Models.Hyperlink _lastHover = null;
    }
--- a/src/Views/InteractiveRebase.axaml.cs
+++ b/src/Views/InteractiveRebase.axaml.cs
@ -23,7 +23,7 @@ namespace SourceGit.Views
            var item = vm.SelectedItem;
            if (item == null)
            {
-                base.OnKeyDown(e); 
+                base.OnKeyDown(e);
                return;
            }

--- a/src/Views/LFSFetch.axaml
+++ b/src/Views/LFSFetch.axaml
@ -25,7 +25,7 @@
        <ComboBox.ItemTemplate>
          <DataTemplate x:DataType="{x:Type m:Remote}">
            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
+              <Path Margin="0,2,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
              <TextBlock Text="{Binding Name}"/>
            </StackPanel>
          </DataTemplate>
--- a/src/Views/LFSPull.axaml
+++ b/src/Views/LFSPull.axaml
@ -25,7 +25,7 @@
        <ComboBox.ItemTemplate>
          <DataTemplate x:DataType="{x:Type m:Remote}">
            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
+              <Path Margin="0,2,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
              <TextBlock Text="{Binding Name}"/>
            </StackPanel>
          </DataTemplate>
--- a/src/Views/LFSPush.axaml
+++ b/src/Views/LFSPush.axaml
@ -25,7 +25,7 @@
        <ComboBox.ItemTemplate>
          <DataTemplate x:DataType="{x:Type m:Remote}">
            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
+              <Path Margin="0,2,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
              <TextBlock Text="{Binding Name}"/>
            </StackPanel>
          </DataTemplate>
--- a/src/Views/LauncherPage.axaml
+++ b/src/Views/LauncherPage.axaml
@ -83,7 +83,7 @@
    </Grid>
    
    <!-- Notification -->
-    <Grid Grid.Row="1" Width="360" HorizontalAlignment="Right" VerticalAlignment="Top">
+    <Grid Grid.Row="1" Width="480" HorizontalAlignment="Right" VerticalAlignment="Top">
      <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
        <ItemsControl ItemsSource="{Binding Notifications}">
          <ItemsControl.ItemTemplate>
--- a/src/Views/PruneRemote.axaml
+++ b/src/Views/PruneRemote.axaml
@ -12,7 +12,7 @@
               Text="{DynamicResource Text.PruneRemote}"/>
    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
      <TextBlock Text="{DynamicResource Text.PruneRemote.Target}"/>
-      <Path Width="14" Height="14" Margin="8,6,8,0" Data="{StaticResource Icons.Remote}"/>
+      <Path Width="14" Height="14" Margin="8,2,8,0" Data="{StaticResource Icons.Remote}"/>
      <TextBlock Text="{Binding Remote.Name}"/>
    </StackPanel>
  </StackPanel>
--- a/src/Views/Pull.axaml
+++ b/src/Views/Pull.axaml
@ -36,7 +36,7 @@
        <ComboBox.ItemTemplate>
          <DataTemplate x:DataType="{x:Type m:Remote}">
            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
+              <Path Margin="0,2,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
              <TextBlock Text="{Binding Name}"/>
            </StackPanel>
          </DataTemplate>
--- a/src/Views/Push.axaml
+++ b/src/Views/Push.axaml
@ -45,7 +45,7 @@
        <ComboBox.ItemTemplate>
          <DataTemplate x:DataType="{x:Type m:Remote}">
            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
+              <Path Margin="0,2,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
              <TextBlock Text="{Binding Name}"/>
            </StackPanel>
          </DataTemplate>
--- a/src/Views/PushTag.axaml
+++ b/src/Views/PushTag.axaml
@ -35,7 +35,7 @@
        <ComboBox.ItemTemplate>
          <DataTemplate x:DataType="{x:Type m:Remote}">
            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
+              <Path Margin="0,2,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
              <TextBlock Text="{Binding Name}"/>
            </StackPanel>
          </DataTemplate>
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@ -11,7 +11,7 @@
             x:DataType="vm:Repository">
  <Grid>
    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.RepositorySidebarWidth, Mode=TwoWay}" MinWidth="200" MaxWidth="400"/>
+      <ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.RepositorySidebarWidth, Mode=TwoWay}" MinWidth="200" MaxWidth="500"/>
      <ColumnDefinition Width="3"/>
      <ColumnDefinition Width="*"/>
    </Grid.ColumnDefinitions>
@ -67,17 +67,25 @@
              </ListBox.ItemsPanel>

              <ListBoxItem>
-                <Grid Classes="view_mode" ColumnDefinitions="32,*,Auto,Auto">
+                <Grid Classes="view_mode" ColumnDefinitions="32,*,Auto,Auto,Auto">
                  <Path Grid.Column="0" Width="12" Height="12" Data="{StaticResource Icons.Histories}"/>
                  <TextBlock Grid.Column="1" Classes="primary" Text="{DynamicResource Text.Histories}"/>
                  <ToggleButton Grid.Column="2"
                                Classes="layout_direction"
-                                Width="32" Height="26"
+                                Width="28" Height="26"
                                IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseTwoColumnsLayoutInHistories, Mode=TwoWay}"
                                ToolTip.Tip="{DynamicResource Text.Histories.DisplayMode}"/>
                  <ToggleButton Grid.Column="3"
                                Classes="line_path"
-                                Width="32" Height="26"
+                                Width="28" Height="26"
+                                Background="Transparent"
+                                IsChecked="{Binding EnableReflog, Mode=TwoWay}"
+                                ToolTip.Tip="{DynamicResource Text.Repository.EnableReflog}">
+                    <Path Width="12" Height="12" Data="{StaticResource Icons.Reference}"/>
+                  </ToggleButton>
+                  <ToggleButton Grid.Column="4"
+                                Classes="line_path"
+                                Width="28" Height="26"
                                Background="Transparent"
                                IsChecked="{Binding EnableFirstParentInHistories, Mode=TwoWay}"
                                ToolTip.Tip="{DynamicResource Text.Repository.FirstParentFilterToggle}">
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@ -85,7 +85,7 @@
            <ComboBox.ItemTemplate>
              <DataTemplate>
                <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-                  <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
+                  <Path Margin="0,2,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
                  <TextBlock Text="{Binding}"/>
                </StackPanel>
              </DataTemplate>
--- a/src/Views/SelfUpdate.axaml
+++ b/src/Views/SelfUpdate.axaml
@ -74,7 +74,7 @@
                        HorizontalContentAlignment="Center"
                        VerticalContentAlignment="Center">
                  <StackPanel Orientation="Horizontal">
-                    <Path Width="12" Height="12" Data="{StaticResource Icons.Pull}"/>
+                    <Path Width="12" Height="12" Data="{StaticResource Icons.Pull}" Fill="White"/>
                    <TextBlock Text="{DynamicResource Text.SelfUpdate.GotoDownload}" Margin="8,0,0,0"/>
                  </StackPanel>
                </Button>
--- a/src/Views/StashesPage.axaml
+++ b/src/Views/StashesPage.axaml
@ -136,7 +136,7 @@

        <ListBox.ItemTemplate>
          <DataTemplate DataType="m:Change">
-            <Grid ColumnDefinitions="24,*">
+            <Grid ColumnDefinitions="24,*" Background="Transparent" ContextRequested="OnChangeContextRequested">
              <v:ChangeStatusIcon Grid.Column="0" Width="14" Height="14" Change="{Binding}"/>
              <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Path}" Margin="4,0,0,0"/>
            </Grid>
--- a/src/Views/StashesPage.axaml.cs
+++ b/src/Views/StashesPage.axaml.cs
@ -18,5 +18,15 @@ namespace SourceGit.Views
            }
            e.Handled = true;
        }
+
+        private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e) 
+        {
+            if (DataContext is ViewModels.StashesPage vm && sender is Grid grid)
+            {
+                var menu = vm.MakeContextMenuForChange(grid.DataContext as Models.Change);
+                grid.OpenContextMenu(menu);
+            }
+            e.Handled = true;
+        }
    }
 }
--- a/src/Views/TagsView.axaml
+++ b/src/Views/TagsView.axaml
@ -26,7 +26,8 @@
                  Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
                  Background="Transparent"
                  ContextRequested="OnRowContextRequested"
-                  DoubleTapped="OnDoubleTappedNode">
+                  DoubleTapped="OnDoubleTappedNode"
+                  ToolTip.Tip="{Binding ToolTip}">
              <v:TagTreeNodeToggleButton Grid.Column="0"
                                         Classes="tree_expander"
                                         Focusable="False"
@ -64,7 +65,10 @@
               SelectionChanged="OnRowSelectionChanged">
        <ListBox.ItemTemplate>
          <DataTemplate DataType="m:Tag">
-            <Grid ColumnDefinitions="Auto,*,Auto" Background="Transparent" ContextRequested="OnRowContextRequested">
+            <Grid ColumnDefinitions="Auto,*,Auto"
+                  Background="Transparent"
+                  ContextRequested="OnRowContextRequested"
+                  ToolTip.Tip="{Binding Message}">
              <Path Grid.Column="0" 
                    Width="10" Height="10"
                    Margin="8,0,0,0"
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@ -131,10 +131,15 @@
                              IsChecked="{Binding IsExpanded}"
                              IsVisible="{Binding !IsRepository}"/>

-                <TextBlock Grid.Column="2" 
-                           Classes="primary" 
-                           VerticalAlignment="Center" 
-                           Text="{Binding Name}"/>
+                <StackPanel Grid.Column="2" Orientation="Horizontal">
+                  <TextBlock Classes="primary" VerticalAlignment="Center" Text="{Binding Name}"/>
+                  <Path Margin="2,0,0,0"
+                        Width="12" Height="12"
+                        Data="{StaticResource Icons.Error}"
+                        Fill="Orange"
+                        IsVisible="{Binding IsInvalid}"/>
+                </StackPanel>
+                
                <TextBlock Grid.Column="3"
                           Classes="primary"
                           Margin="8,0"
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@ -185,7 +185,7 @@
      <v:CommitMessageTextBox Grid.Row="2" Text="{Binding CommitMessage, Mode=TwoWay}"/>

      <!-- Commit Options -->
-      <Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto">
+      <Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto">
        <Button Grid.Column="0"
                Classes="icon_button"
                Margin="4,0,0,0" Padding="0"
@ -198,7 +198,6 @@

        <Button Grid.Column="1"
                Classes="icon_button"
-                Width="32"
                Margin="4,2,0,0"
                Click="OnOpenAIAssist"
                ToolTip.Tip="{DynamicResource Text.AIAssistant.Tip}"
@ -207,23 +206,33 @@
          <Path Width="15" Height="15" Data="{StaticResource Icons.AIAssist}"/>
        </Button>

-        <CheckBox Grid.Column="2"
+        <Button Grid.Column="2"
+                Classes="icon_button"
+                Margin="0,2,0,0"
+                Click="OnOpenConventionalCommitHelper"
+                ToolTip.Tip="{DynamicResource Text.ConventionalCommit}"
+                ToolTip.Placement="Top"
+                ToolTip.VerticalOffset="0">
+          <Path Width="15" Height="15" Data="{StaticResource Icons.CommitMessageGenerator}"/>
+        </Button>
+
+        <CheckBox Grid.Column="3"
                  Height="24"
                  Margin="4,0,0,0"
                  HorizontalAlignment="Left"
                  IsChecked="{Binding AutoStageBeforeCommit, Mode=TwoWay}"
                  Content="{DynamicResource Text.WorkingCopy.AutoStage}"/>

-        <CheckBox Grid.Column="3"
+        <CheckBox Grid.Column="4"
                  Height="24"
                  Margin="8,0,0,0"
                  HorizontalAlignment="Left"
                  IsChecked="{Binding UseAmend, Mode=TwoWay}"
                  Content="{DynamicResource Text.WorkingCopy.Amend}"/>

-        <v:LoadingIcon Grid.Column="5" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/>
+        <v:LoadingIcon Grid.Column="6" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/>

-        <Button Grid.Column="6"
+        <Button Grid.Column="7"
                Classes="flat primary"
                Content="{DynamicResource Text.WorkingCopy.Commit}"
                Height="28"
@ -248,13 +257,13 @@
        </Button>
        
        <!-- Invisible button just to add another hotkey `Ctrl+Shift+Enter` to commit with auto-stage -->
-        <Button Grid.Column="7"
+        <Button Grid.Column="8"
                Width="0" Height="0"
                Background="Transparent"
                Command="{Binding CommitWithAutoStage}"
                HotKey="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+Shift+Enter}"/>

-        <Button Grid.Column="8"
+        <Button Grid.Column="9"
                Classes="flat"
                Content="{DynamicResource Text.WorkingCopy.CommitAndPush}"
                Height="28"
--- a/src/Views/WorkingCopy.axaml.cs
+++ b/src/Views/WorkingCopy.axaml.cs
@ -144,5 +144,20 @@ namespace SourceGit.Views

            e.Handled = true;
        }
+
+        private void OnOpenConventionalCommitHelper(object _, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.WorkingCopy vm)
+            {
+                var dialog = new ConventionalCommitMessageBuilder() 
+                { 
+                    DataContext = new ViewModels.ConventionalCommitMessageBuilder(vm) 
+                };
+
+                App.OpenDialog(dialog);
+            }
+
+            e.Handled = true;
+        }
    }
 }
 @ -1 +1 @@
 .34
 .35