From eb0b9dcb39d3bbff825100f5633afded5125cbf9 Mon Sep 17 00:00:00 2001
From: Beeant <huangxb0512@gmail.com>
Date: Mon, 20 Nov 2023 16:48:44 +0800
Subject: [PATCH] Update action.yml

---
 action.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 24c1643..3d0089a 100644
--- a/action.yml
+++ b/action.yml
@@ -12,6 +12,9 @@ inputs:
   upstream-branch:
     description: 'Upstream branch to merge from. For example, master'
     default: 'master'
+  ff:
+    description: 'merge behavior, For example, --ff-only, --no-ff, --ff'
+    default: '--ff-only'
   branch:
     description: 'Branch to merge to. For example, master'
     default: 'master'
@@ -34,6 +37,6 @@ runs:
         git branch --all
         git config --list
         git checkout ${{ inputs.branch }}
-        git merge --ff-only upstream/${{ inputs.upstream-branch }}
+        git merge ${{ inputs.ff }} upstream/${{ inputs.upstream-branch }}
         git push 
       shell: bash