diff --git a/README.md b/README.md index f03ccdea..7b523ab1 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/README.zh-cn.md b/README.zh-cn.md index 074dfdae..19e12fe3 100644 --- a/README.zh-cn.md +++ b/README.zh-cn.md @@ -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` 将主题更新至最新版本: diff --git a/fixit_checker.sh b/fixit_checker.sh index dd0e86d3..b4f23864 100644 --- a/fixit_checker.sh +++ b/fixit_checker.sh @@ -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" \ No newline at end of file