allow additional params to be passed to the merge

step.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 set -ex
 
-echo "This is the value specified for the input 'example_step_input': ${example_step_input}"
-
 #
 # --- Export Environment Variables for other Steps:
 # You can export Environment Variables for other Steps with
@@ -44,15 +42,15 @@ create_pr() {
     exit 1
 }
 
-git fetch
+git fetch -q
 
 #! Checkout the branch to merge from
 git checkout $branch_to_merge_from
 
 #! Checkout the branch to merge into
 git checkout $branch_to_merge_into
 
-git merge $branch_to_merge_from || create_pr
+git merge $branch_to_merge_from $additional_merge_options || create_pr
 
 echo 'no conflicts'
 
@@ -62,4 +60,4 @@ git push
 #! Return success
 exit 0
 
-fi
+fi

step.yml

@@ -81,6 +81,14 @@ inputs:
         a git branch name
       is_expand: true
       is_required: true
+  - additional_merge_options: 
+    opts:
+      title: "Additional merge options"
+      summary: Extra --options to add to git merge
+      description: |
+        command line options allowed by git merge
+      is_expand: true
+      is_required: false
 
 outputs:
   - CREATED_PULL_REQUEST: