mirror of
https://github.com/kiegroup/git-backporting.git
synced 2025-06-30 14:43:47 +00:00
feat(issue-62): make cherry-pick strategy configurable (#63)
fix https://github.com/kiegroup/git-backporting/issues/62
This commit is contained in:
parent
ead1322c0f
commit
265955dda7
18 changed files with 312 additions and 58 deletions
|
@ -59,6 +59,14 @@ inputs:
|
|||
description: "If set to true the tool will backport all commits as part of the pull request instead of the suqashed one"
|
||||
required: false
|
||||
default: "false"
|
||||
strategy:
|
||||
description: "Cherry-pick merge strategy"
|
||||
required: false
|
||||
default: "recursive"
|
||||
strategy-option:
|
||||
description: "Cherry-pick merge strategy option"
|
||||
required: false
|
||||
default: "theirs"
|
||||
|
||||
runs:
|
||||
using: node16
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue