From 0fd57298ff57b441aeeb72a3b65635ab63dade05 Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Sat, 9 May 2020 20:39:26 +0800 Subject: [PATCH] Update r1s_lean_h3.yml --- .github/workflows/r1s_lean_h3.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/r1s_lean_h3.yml b/.github/workflows/r1s_lean_h3.yml index 3355948..9f444f8 100644 --- a/.github/workflows/r1s_lean_h3.yml +++ b/.github/workflows/r1s_lean_h3.yml @@ -60,6 +60,7 @@ jobs: git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream git rebase e561fa6fcc2e744c4a8cbfa1b4cf65107a675414^ --onto 1dee4bedde119aadc586ebf7105cfded3c220711 #bypass a commit that cause an error for next rebasing git rebase 52a38e950de0686cb5a2d3e8e05c38027a8e3d0d^ --onto upstream/master -X theirs + git revert --no-edit b65f1ebf0089a2fa0d3e1ad30efc21385a013139 git revert --no-edit 2c37fa71f93d150eb67bffdc5bdac8abf5354b16 git revert --no-edit 23378ed9a481dc73923f5bfa81637a1a8056882d git revert --no-edit 4787dbaf3cad44b374b660cc0fef9386963e6795