📚 change defalt branch (README.md)
This commit is contained in:
parent
ee34ccbf4b
commit
4f7cea7ec5
1 changed files with 4 additions and 4 deletions
|
@ -66,7 +66,7 @@ sudo -iu puyoskey
|
||||||
Clone the Puyoskey repository, and copy the example configuration file:
|
Clone the Puyoskey repository, and copy the example configuration file:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git clone --recurse-submodules -b master https://git.v-sli.me/HidemaruOwO/puyoskey.git
|
git clone --recurse-submodules -b main https://git.v-sli.me/HidemaruOwO/puyoskey.git
|
||||||
cd puyoskey
|
cd puyoskey
|
||||||
pnpm install --frozen-lockfile
|
pnpm install --frozen-lockfile
|
||||||
cp .config/example.yml .config/default.yml
|
cp .config/example.yml .config/default.yml
|
||||||
|
@ -187,7 +187,7 @@ systemctl enable puyoskey.timer
|
||||||
## Update Guide 💫
|
## Update Guide 💫
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git checkout master
|
git checkout main
|
||||||
git pull
|
git pull
|
||||||
git submodule update --init
|
git submodule update --init
|
||||||
pnpm install --frozen-lockfile
|
pnpm install --frozen-lockfile
|
||||||
|
@ -216,7 +216,7 @@ git fetch base
|
||||||
git checkout -b stable base/stable
|
git checkout -b stable base/stable
|
||||||
|
|
||||||
# Switch to puyoskey branch
|
# Switch to puyoskey branch
|
||||||
git checkout master
|
git checkout main
|
||||||
# Merge from stable branch
|
# Merge from stable branch
|
||||||
git merge --squash stable
|
git merge --squash stable
|
||||||
|
|
||||||
|
@ -224,7 +224,7 @@ git merge --squash stable
|
||||||
# Commit with an appropriate message
|
# Commit with an appropriate message
|
||||||
git commit -m ":recycle: Merge updates from upstream as v2024.11.2"
|
git commit -m ":recycle: Merge updates from upstream as v2024.11.2"
|
||||||
|
|
||||||
git push origin master
|
git push origin main
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
Loading…
Add table
Reference in a new issue