From cc80acf4eb5497ad3c36452c3c5bd309f492618b Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Mon, 24 Feb 2020 04:48:10 +0800 Subject: [PATCH] Update r2s_lean.yml --- .github/workflows/r2s_lean.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index c9e4ef3..d2a30da 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -82,7 +82,7 @@ jobs: cd friendlywrt 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 commit -m 'for rebasing' + git add . && git commit -m 'for rebasing' git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs git checkout upstream/master -- feeds.conf.default git apply ../../0001-fix-upx.patch