dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-21 12:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feature: supports merge selected commit to current branch (#800)

Browse source
This commit is contained in:
leo 2024-12-12 10:03:34 +08:00
parent e17b53da42
commit 2053ce033d
No known key found for this signature in database
7 changed files with 41 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/ViewModels/Histories.cs
View file

@ -513,6 +513,21 @@ namespace SourceGit.ViewModels
e.Handled = true;
};
menu.Items.Add(cherryPick);
if (!commit.HasDecorators)
{
var merge = new MenuItem();
merge.Header = new Views.NameHighlightedTextBlock("CommitCM.Merge", current.Name);
merge.Icon = App.CreateMenuIcon("Icons.Merge");
merge.Click += (_, e) =>
{
if (PopupHost.CanCreatePopup())
PopupHost.ShowPopup(new Merge(_repo, commit, current.Name));
e.Handled = true;
};
menu.Items.Add(merge);
}
}
else
{