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: support --ff-only option for git merge command

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-03-17 19:53:47 +08:00
parent 2b95ea2ab1
commit a0cddaea80
No known key found for this signature in database
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ViewModels/Histories.cs
View file

@ -871,7 +871,7 @@ namespace SourceGit.ViewModels
return;
if (_repo.CanCreatePopup())
_repo.ShowAndStartPopup(new Merge(_repo, b, current.Name));
_repo.ShowAndStartPopup(new Merge(_repo, b, current.Name, true));
e.Handled = true;
};
@ -972,7 +972,7 @@ namespace SourceGit.ViewModels
merge.Click += (_, e) =>
{
if (_repo.CanCreatePopup())
_repo.ShowPopup(new Merge(_repo, branch, current.Name));
_repo.ShowPopup(new Merge(_repo, branch, current.Name, false));
e.Handled = true;
};
submenu.Items.Add(merge);
@ -1060,7 +1060,7 @@ namespace SourceGit.ViewModels
merge.Click += (_, e) =>
{
if (_repo.CanCreatePopup())
_repo.ShowPopup(new Merge(_repo, branch, current.Name));
_repo.ShowPopup(new Merge(_repo, branch, current.Name, false));
e.Handled = true;
};