yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update r2s_lienol.yml

Browse Source
This commit is contained in:
klever1988
2020-02-07 10:51:22 +08:00
committed by GitHub
parent ca050a2ef6
commit 75838e0029
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/r2s_lienol.yml vendored
View File

@@ -51,7 +51,7 @@ jobs:
git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream
git checkout upstream/my-19.07-full -b tmp git checkout upstream/my-19.07-full -b tmp
git mv README.md README && git commit -m 'undo rename readme for rebasing' 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 rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs
git checkout upstream/my-19.07-full -- feeds.conf.default git checkout upstream/my-19.07-full -- feeds.conf.default