dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-21 04:04:59 +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/Repository.cs
View file

@ -1516,7 +1516,7 @@ namespace SourceGit.ViewModels
return;
if (CanCreatePopup())
ShowAndStartPopup(new Merge(this, b, branch.Name));
ShowAndStartPopup(new Merge(this, b, branch.Name, true));
e.Handled = true;
};
@ -1595,7 +1595,7 @@ namespace SourceGit.ViewModels
merge.Click += (_, e) =>
{
if (CanCreatePopup())
ShowPopup(new Merge(this, branch, _currentBranch.Name));
ShowPopup(new Merge(this, branch, _currentBranch.Name, false));
e.Handled = true;
};
@ -1876,7 +1876,7 @@ namespace SourceGit.ViewModels
merge.Click += (_, e) =>
{
if (CanCreatePopup())
ShowPopup(new Merge(this, branch, _currentBranch.Name));
ShowPopup(new Merge(this, branch, _currentBranch.Name, false));
e.Handled = true;
};