Skip to content

Commit

Permalink
Update Merge-Upstream.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
ClayMoreBoy authored Jan 12, 2024
1 parent 937a540 commit 641c949
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/Merge-Upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
ref: main
ref: master
fetch-depth: 0
lfs: true

Expand All @@ -36,6 +36,7 @@ jobs:
git config --global user.name "github-actions[bot]"
git config --global pull.rebase false
git config --global --list
rm -rf .git/
- name: Load upstream commits
run: git pull https://github.com/xiaorouji/openwrt-passwall.git --log --no-commit
Expand Down

0 comments on commit 641c949

Please sign in to comment.