From 022b3cbf19d43c6b0bb54c0d3f041d43065c7683 Mon Sep 17 00:00:00 2001 From: Aaron Dalton Date: Thu, 15 Feb 2024 16:16:58 -0500 Subject: [PATCH] Use keep redundant commit --- .github/workflows/fork-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index ac082fb2..42631afd 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -40,7 +40,7 @@ jobs: git checkout -b release/${TAG} ${TAG} git rm .github/workflows/* git commit -m "Remove existing workflows" - git rev-list --no-merges --reverse main ^upstream/main | git cherry-pick --stdin --allow-empty + git rev-list --no-merges --reverse main ^upstream/main | git cherry-pick --stdin --keep-redundant-commits done for TAG in ${NEW_TAGS}; do git push -u origin release/${TAG}