github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-26 03:40:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: supports to customize merge message (--edit) (#1421)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-06-17 15:07:55 +08:00
parent a8da8c09ac
commit 90310a704d
6 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ViewModels/Merge.cs
View File

@@ -21,6 +21,12 @@ namespace SourceGit.ViewModels
set;
}
public bool Edit
{
get;
set;
} = false;
public Merge(Repository repo, Models.Branch source, string into, bool forceFastForward)
{
_repo = repo;
@@ -62,7 +68,7 @@ namespace SourceGit.ViewModels
return Task.Run(() =>
{
new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg).Use(log).Exec();
new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, Edit).Use(log).Exec();
log.Complete();
var head = new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").Result();