diff --git a/.github/workflows/ci-kiwi-9-compliant.yml b/.github/workflows/ci-kiwi-9-compliant.yml index 11b6b57fb95..1832ce46ec1 100644 --- a/.github/workflows/ci-kiwi-9-compliant.yml +++ b/.github/workflows/ci-kiwi-9-compliant.yml @@ -12,4 +12,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Run rebase - run: git fetch --all; git config user.email cherrypick@action.com; git config user.name git_action; git checkout master; git log --pretty=oneline --no-merges "origin/master..origin/${GITHUB_HEAD_REF}" | cut -f1 -d " " | head -n -1 > commit.list; git cherry-pick $(tac commit.list | tr "\n" " ") + run: git fetch --all; git config user.email cherrypick@action.com; git config user.name git_action; git checkout master; git log --pretty=oneline --no-merges "origin/master..origin/${GITHUB_HEAD_REF}" | cut -f1 -d " " | head -n -1 > commit.list; git cherry-pick --keep-redundant-commits $(tac commit.list | tr "\n" " ")