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

enhance: supports --skip while reverting commits

Browse source
This commit is contained in:
leo 2024-12-11 15:12:25 +08:00
parent dcaeaef48a
commit 0dd6692cd8
No known key found for this signature in database
5 changed files with 94 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/ViewModels/WorkingCopy.cs
View file

@ -491,6 +491,29 @@ namespace SourceGit.ViewModels
}
}
public void SkipMerge()
{
if (_inProgressContext != null)
{
_repo.SetWatcherEnabled(false);
Task.Run(() =>
{
var succ = _inProgressContext.Skip();
Dispatcher.UIThread.Invoke(() =>
{
if (succ)
CommitMessage = string.Empty;
_repo.SetWatcherEnabled(true);
});
});
}
else
{
_repo.MarkWorkingCopyDirtyManually();
}
}
public void AbortMerge()
{
if (_inProgressContext != null)