Update r2s_lean_minimal.yml
This commit is contained in:
1
.github/workflows/r2s_lean_minimal.yml
vendored
1
.github/workflows/r2s_lean_minimal.yml
vendored
@@ -126,6 +126,7 @@ jobs:
|
|||||||
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
|
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
|
||||||
git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
|
git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
|
||||||
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs
|
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs
|
||||||
|
git revert --no-edit 2c37fa71f93d150eb67bffdc5bdac8abf5354b16
|
||||||
git revert --no-edit 23378ed9a481dc73923f5bfa81637a1a8056882d
|
git revert --no-edit 23378ed9a481dc73923f5bfa81637a1a8056882d
|
||||||
git revert --no-edit 4787dbaf3cad44b374b660cc0fef9386963e6795
|
git revert --no-edit 4787dbaf3cad44b374b660cc0fef9386963e6795
|
||||||
git revert --no-edit 463b6ac0508de4788a6e41335471ced0a255e1cd
|
git revert --no-edit 463b6ac0508de4788a6e41335471ced0a255e1cd
|
||||||
|
|||||||
Reference in New Issue
Block a user