diff options
| author | Ben Guo <ben.guo@openatom.club> | 2026-04-16 12:26:46 +0800 |
|---|---|---|
| committer | Alex Shi <alexs@kernel.org> | 2026-07-17 20:24:08 +0800 |
| commit | 596b66b4f52db25169ab138a001b2b22952ff260 (patch) | |
| tree | 22d96e1e59d35f955f466c9c00fd7dd04ea05758 | |
| parent | 28d2c3b03edff72d73081d69c501f58502b0e0d4 (diff) | |
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 <ben.guo@openatom.club>
Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
Signed-off-by: Alex Shi <alexs@kernel.org>
| -rw-r--r-- | Documentation/translations/zh_CN/how-to.rst | 4 |
1 files changed, 3 insertions, 1 deletions
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 <si.yanteng@linux.dev> # 如果您前面的步骤正确执行，该行会自动显示，否则请检查 gitconfig 文件 |