mirror of
https://github.com/hugo-fixit/FixIt.git
synced 2026-08-24 15:28:57 +00:00
🔧 Chore: add option --merge to checker command
This commit is contained in:
@@ -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
@@ -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
@@ -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"
|
||||
Reference in New Issue
Block a user