dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-23 19:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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
No known key found for this signature in database
6 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Commands/Merge.cs
View file

@ -5,11 +5,20 @@ namespace SourceGit.Commands
{
public class Merge : Command
{
public Merge(string repo, string source, string mode)
public Merge(string repo, string source, string mode, bool edit)
{
WorkingDirectory = repo;
Context = repo;
Args = $"merge --progress {source} {mode}";
Editor = EditorType.CoreEditor;
var builder = new StringBuilder();
builder.Append("merge --progress ");
builder.Append(edit ? "--edit " : "--no-edit ");
builder.Append(source);
builder.Append(' ');
builder.Append(mode);
Args = builder.ToString();
}
public Merge(string repo, List<string> targets, bool autoCommit, string strategy)