From 75838e0029c87b3ef69bf0bf88cda7a1bbc26cdd Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Fri, 7 Feb 2020 10:51:22 +0800 Subject: [PATCH] Update r2s_lienol.yml --- .github/workflows/r2s_lienol.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml index 7e041e5..b3b93c3 100644 --- a/.github/workflows/r2s_lienol.yml +++ b/.github/workflows/r2s_lienol.yml @@ -51,7 +51,7 @@ jobs: git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream git checkout upstream/my-19.07-full -b tmp git mv README.md README && git commit -m 'undo rename readme for rebasing' - git checkout original/master + git checkout origin/master git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs git checkout upstream/my-19.07-full -- feeds.conf.default