From 7454fc0b9b1d261c6050e3d418d16cc842903c31 Mon Sep 17 00:00:00 2001 From: Rasic2 <1051987201@qq.com> Date: Fri, 19 Sep 2025 21:44:04 +0800 Subject: [PATCH] docs: add git log command for comparing branches and fix indentation in examples --- docs/source/development/git.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/source/development/git.md b/docs/source/development/git.md index b7ba55b..5098dcb 100644 --- a/docs/source/development/git.md +++ b/docs/source/development/git.md @@ -228,6 +228,7 @@ git log -p file # 查看某个文件的修改历史 git log COMMIT1..COMMIT2 -- file # 查看某个文件从 COMMIT1 到COMMIT2 所有的修改情况(概略信息) git log COMMIT1..COMMIT2 -p file # 查看某个文件从 COMMIT1 到COMMIT2 所有的修改情况(详细信息) git log -n 4 --pretty=format:"%s" # 查看最近4条提交记录并只显示提交信息 +git log --pretty=format:"%s" main..dev/zhouh # 查看 dev/zhouh 分支相比 main 分支的差异 ``` - 合并分支(变基) @@ -561,8 +562,8 @@ oco config set OCO_API_KEY=xxx ```bash oco config set OCO_GITPUSH=false # 关闭自动 push oco config set OCO_ONE_LINE_COMMIT=true # 单行 commit - oco config set OCO_OMIT_SCOPE=true # 省略 scope - oco config set OCO_TOKENS_MAX_INPUT=40960 # 修改输入最大 Token 数 +oco config set OCO_OMIT_SCOPE=true # 省略 scope +oco config set OCO_TOKENS_MAX_INPUT=40960 # 修改输入最大 Token 数 ``` 4. 使用 oco 命令生成 commit