From 7a442a475621e63331a17c7c5860a90f831473a0 Mon Sep 17 00:00:00 2001 From: Aaron Dalton Date: Tue, 6 Feb 2024 10:01:23 -0500 Subject: [PATCH] Don't include merges in new revisions --- .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 1968abe5..be54722f 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -38,7 +38,7 @@ jobs: run: | for TAG in ${NEW_TAGS}; do git checkout -b release/${TAG} ${TAG} - git rev-list --reverse main ^upstream/main | git cherry-pick --stdin + git rev-list --no-merges --reverse main ^upstream/main | git cherry-pick --stdin git tag -d ${TAG} git tag ${TAG} release/${TAG} done