Not edit message on next command

DevLyon · Sep 17, 2023 · 66e485f · 66e485f
1 parent 390735b
commit 66e485f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/run b/run
@@ -172,7 +172,7 @@ function addStepNavigationCommand(){
 git add -A
 git commit -m "Abort test"
 git checkout -b ${workshopBranch}-${tag} ${tag}
-git merge ${tag}-test1 > /dev/null
+git merge --no-edit ${tag}-test1 > /dev/null
 git checkout --ours .
 git add .
 git commit -m "Merge with test branch"
@@ -267,7 +267,7 @@ function addNavigationCommand(){
  
 git add -A
 git commit -m "Resolve test"
-git merge $tag
+git merge --no-edit $tag
 EOF
 
   if [ $testNum -eq 1 ]

diff --git a/run.ps1 b/run.ps1
@@ -15,14 +15,14 @@ PowerShell -ExecutionPolicy Bypass -File @@scriptname@@.ps1
 $nextCommandTemplate = @"
 git add -A 
 git commit -m "Resolve test"
-git merge @@nexttag@@
+git merge --no-edit @@nexttag@@
 "@
 
 $jumpToNextStepCommandTemplate = @"
 git add -A
 git commit -m "Abort test"
 git checkout -b $workshopBranch-@@nexttag@@ @@nexttag@@ 
-git merge @@nexttag@@-test1 *> `$null`
+git merge --no-edit @@nexttag@@-test1 *> `$null`
 git checkout --ours . 
 git add . 
 git commit -m "Merge with test branch"