From 596b66b4f52db25169ab138a001b2b22952ff260 Mon Sep 17 00:00:00 2001 From: Ben Guo Date: Thu, 16 Apr 2026 12:26:46 +0800 Subject: [PATCH] docs/zh_CN: add --no-merges to git log example in how-to.rst Add --no-merges flag to prevent referencing merge commits in the through-commit field of translation commit messages. Signed-off-by: Ben Guo Reviewed-by: Dongliang Mu Signed-off-by: Alex Shi --- Documentation/translations/zh_CN/how-to.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/translations/zh_CN/how-to.rst b/Documentation/translations/zh_CN/how-to.rst index a46d7395b11c..3dcf6754d1df 100644 --- a/Documentation/translations/zh_CN/how-to.rst +++ b/Documentation/translations/zh_CN/how-to.rst @@ -257,7 +257,9 @@ Git 和邮箱配置 Update the translation through commit b080e52110ea ("docs: update self-protection __ro_after_init status") - # 请执行 git log --oneline <您翻译的英文文档路径>，并替换上述内容 + # 请执行 git log --no-merges --oneline <您翻译的英文文档路径> + # 并替换上述内容。注意：应引用实际修改文件内容的 commit， + # 而非 merge commit Signed-off-by: Yanteng Si # 如果您前面的步骤正确执行，该行会自动显示，否则请检查 gitconfig 文件