Update Merge-Upstream.yml

OpenWrt-Actions · Jan 12, 2024 · 0b79447 · 0b79447
1 parent 427cff3
commit 0b79447
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/Merge-Upstream.yml b/.github/workflows/Merge-Upstream.yml
@@ -38,7 +38,7 @@ jobs:
         git config --global --list
 
     - name: Load upstream commits
-      run: git pull https://github.com/xiaorouji/openwrt-passwall.git --log --no-commit
+      run: git pull https://github.com/xiaorouji/openwrt-passwall.git --log --no-commit --allow-unrelated-histories
 
     - name: Apply commit changes
       run: |