🔧 Chore: add option --merge to checker command

This commit is contained in:
Cell
2022-01-19 00:12:33 +08:00
parent af34ed359f
commit ff9b2b558d
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ git submodule add https://github.com/Lruihao/FixIt.git themes/FixIt
And later you can update the submodule in your site directory to the latest commit using this command:
```bash
git submodule update --remote
git submodule update --remote --merge
```
Or use shell command `fixit_checker.sh` to update and commit in the theme directory.
+1 -1
View File
@@ -34,7 +34,7 @@ git submodule add https://github.com/Lruihao/FixIt.git themes/FixIt
之后,你可以在站点目录通过这条命令来将主题更新至最新版本:
```bash
git submodule update --remote
git submodule update --remote --merge
```
或者在主题目录中使用 shell 命令 `fixit_checker.sh` 将主题更新至最新版本:
+1 -1
View File
@@ -1,5 +1,5 @@
echo "Checking for FixIt updates ..."
cd ../..
git submodule update --remote
git submodule update --remote --merge
git add themes/FixIt
git commit -m ":arrow_up: Chore: update FixIt theme version"