Skip to content

Commit b032beb

Browse files
committed
enhance: do not ignore lines start with # in commit message while rebasing (#2491)
Signed-off-by: leo <longshuang@msn.cn>
1 parent 3c6e539 commit b032beb

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

‎src/Commands/Command.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ protected ProcessStartInfo CreateGitStartInfo(bool redirect)
202202
builder.Append($"""-c core.editor="\"{selfExecFile}\" --core-editor" """);
203203
break;
204204
case EditorType.RebaseEditor:
205-
builder.Append($"""-c core.editor="\"{selfExecFile}\" --rebase-message-editor" -c sequence.editor="\"{selfExecFile}\" --rebase-todo-editor" -c rebase.abbreviateCommands=true """);
205+
builder.Append($"""-c core.commentChar=± -c core.editor="\"{selfExecFile}\" --rebase-message-editor" -c sequence.editor="\"{selfExecFile}\" --rebase-todo-editor" -c rebase.abbreviateCommands=true """);
206206
break;
207207
default:
208208
builder.Append("-c core.editor=true ");

‎src/Commands/Merge.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public Merge(string repo, string source, string mode, bool edit)
99
{
1010
WorkingDirectory = repo;
1111
Context = repo;
12-
Editor = EditorType.CoreEditor;
1312

1413
var builder = new StringBuilder();
1514
builder.Append("merge --progress ");

0 commit comments

Comments
 (0)