[PATCH] docs/zh_CN: add --no-merges to git log example in how-to.rst

[Ben Guo]

Add --no-merges flag to prevent referencing merge commits in the
through-commit field of translation commit messages.

Signed-off-by: Ben Guo <ben...@openatom.club>
---
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 7ae5d876588..39ed7054fa3 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.ya...@linux.dev>
# 如果您前面的步骤正确执行，该行会自动显示，否则请检查 gitconfig 文件
--
2.53.0

[Dongliang Mu]

On 4/14/26 9:44 AM, Ben Guo wrote:
> Add --no-merges flag to prevent referencing merge commits in the
> through-commit field of translation commit messages.
>
> Signed-off-by: Ben Guo <ben...@openatom.club>

Reviewed-by: Dongliang Mu <dz...@hust.edu.cn>

Note that, when you send LKML, please do not attach my tag since this is
only for internal review.

[Ben Guo]

Add --no-merges flag to prevent referencing merge commits in the
through-commit field of translation commit messages.

Signed-off-by: Ben Guo <ben...@openatom.club>

---
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 7ae5d876588..39ed7054fa3 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.ya...@linux.dev>
# 如果您前面的步骤正确执行，该行会自动显示，否则请检查 gitconfig 文件

--
2.53.0

[Dongliang Mu]

On 4/16/26 12:26 PM, Ben Guo wrote:
> Add --no-merges flag to prevent referencing merge commits in the
> through-commit field of translation commit messages.
>
> Signed-off-by: Ben Guo <ben...@openatom.club>
> ---

Reviewed-by: Dongliang Mu <dz...@hust.edu.cn>

[Alex Shi]

Applied thanks!