keep redundant commits when cherry-picking

storybookjs · Jul 3, 2023 · 4e02ee9 · 4e02ee9
1 parent c1f399b
commit 4e02ee9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/release/pick-patches.ts b/scripts/release/pick-patches.ts
@@ -118,7 +118,7 @@ export const run = async (_: unknown) => {
     const prSpinner = ora(`Cherry picking #${pr.number}`).start();
 
     try {
-      await git.raw(['cherry-pick', '-m', '1', '-x', pr.mergeCommit]);
+      await git.raw(['cherry-pick', '-m', '1', '--keep-redundant-commits', '-x', pr.mergeCommit]);
       prSpinner.succeed(`Picked: ${formatPR(pr)}`);
     } catch (pickError) {
       prSpinner.fail(`Failed to automatically pick: ${formatPR(pr)}`);