feat: Option to commit merge changes (#4)

README.md

@@ -14,6 +14,7 @@ pr-mpt/actions-merge-branch@v1
 | **`from`** | **Branch to merge into the current branch** | **<kbd>required</kbd>** | **`main`** |
 | `author` | Merge commit author | GitHub Actions<sup>[1]</sup> | `Alice <[email protected]>` |
 | `strategy` | Merge strategy with options | `recursive -Xtheirs` | `recursive`<br/>`recursive -Xours` |
+| `commit` | Commit changes? | `true` | `true` `false` |
 | `push` | Push merge commit to origin? | `true` | `true` `false` |
 
 [1] [`github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>`][users/github-actions]

action.yml

@@ -7,6 +7,10 @@ inputs:
   from:
     description: "Branch to merge into the current branch"
     required: true
+  commit:
+    description: "Commit changes?"
+    default: "true"
+    required: true
   author:
     description: "Commit author in Git author format"
     default: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
@@ -29,7 +33,14 @@ runs:
         git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
     - name: Merge ${{ inputs.from }} with ${{ inputs.strategy }} strategy
       shell: bash
-      run: git merge ${{ inputs.from }} -s ${{ inputs.strategy }} --no-ff
+      run: |
+        MERGE="git merge ${{ inputs.from }} -s ${{ inputs.strategy }}"
+        if [ "${{ inputs.commit }}" == "true" ]
+        then
+          eval $MERGE --commit
+        else
+          eval $MERGE --no-commit
+        fi
     - name: "Push changes from ${{ inputs.from }} to origin"
       shell: bash
       run: |