Skip to content

support merge action choice, by default: --ff-only #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support merge action choice, by default: --ff-only #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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