From nobody Tue Jun 16 04:08:28 2026 Received: from va-2-40.ptr.blmpb.com (va-2-40.ptr.blmpb.com [209.127.231.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12EDE271464 for ; Thu, 16 Apr 2026 04:27:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.127.231.40 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776313627; cv=none; b=B3vL8zM0ro7mKWZtNJjs5Nq8hV0BPmop3uaFSrZp1xrhHxmRGpqwwX9aveGn7eyGC65Vt9VOQiNNoStyQa9kIlLiKXcE8Jl8nrnVGIJauoE/vF/UuVpeJoi2LdRT+6F4g40FKIHtyTdq1+zzULwo5Jj6maCDHhf4pA6oKWsLGmk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776313627; c=relaxed/simple; bh=t1P26FZJonWwvDC3mGQbzKCVjhjqiHd1Q2OcyMf/BV4=; h=Cc:Date:Message-Id:Mime-Version:To:From:Content-Type:Subject; b=B4hLgWQlQNZJolrzA4Jwerfr6CiZcNH6weYeTTRTj7jPjqegjXgx8evuNApYvHOqXNsO4rV7as0uB1d9ozRFt3X6VwBYySH5tPOPgWdmU1B3AiFGfohPXYbxHLDlZAD8LdYEh2aFeQuuPdV4+BIOcmY8hVfAyWHBtsY3dkUDf3Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=openatom.club; spf=pass smtp.mailfrom=openatom.club; dkim=pass (2048-bit key) header.d=openatom-club.20200927.dkim.feishu.cn header.i=@openatom-club.20200927.dkim.feishu.cn header.b=I7tUstSq; arc=none smtp.client-ip=209.127.231.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=openatom.club Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=openatom.club Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=openatom-club.20200927.dkim.feishu.cn header.i=@openatom-club.20200927.dkim.feishu.cn header.b="I7tUstSq" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=s1; d=openatom-club.20200927.dkim.feishu.cn; t=1776313611; h=from:subject:mime-version:from:date:message-id:subject:to:cc: reply-to:content-type:mime-version:in-reply-to:message-id; bh=t1P26FZJonWwvDC3mGQbzKCVjhjqiHd1Q2OcyMf/BV4=; b=I7tUstSqrPSwPEKZqhl1zh/t8mSAgXz22xu2z+n0tOeECTcCqyqPzFYagWWLK+TPOzoNOK MAH+PoE3MDNVRfQLOBNEGOWCElTl4FpM/rt10WNC5vmwKEV0QqLyCBqU8p6pLiCrQMZdEX MWKxeFt5As7ueoSu4od8FijZBFEb1ze0T/jcufiXc+6V6rKeBJFFmAXmC2DDJqMXTlEjh9 jEqth8fw02beltFami8F8aP36jTiSq19z5DfzksL0HWfr4IX/OrHxIU8TpRxFmSbrN2WeW dWU8Q4noK8UCwXTvAo5h0Hrc32ZW4f+sjBGqiC58/CvbGxVCrKT9aiOGtUecvg== Received: from localhost ([58.35.126.19]) by smtp.feishu.cn with ESMTPS; Thu, 16 Apr 2026 12:26:48 +0800 Cc: , , Date: Thu, 16 Apr 2026 12:26:46 +0800 Message-Id: <20260416042647.3646595-1-ben.guo@openatom.club> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.53.0 To: "Alex Shi" , "Yanteng Si" , "Dongliang Mu" , "Jonathan Corbet" From: "Ben Guo" X-Lms-Return-Path: X-Original-From: Ben Guo Content-Transfer-Encoding: quoted-printable Subject: [PATCH] docs/zh_CN: add --no-merges to git log example in how-to.rst Content-Type: text/plain; charset="utf-8" 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 --- 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/tr= anslations/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 =E5=92=8C=E9=82=AE=E7=AE=B1=E9=85=8D=E7=BD=AE =20 Update the translation through commit b080e52110ea ("docs: update self-protection __ro_after_init status") - # =E8=AF=B7=E6=89=A7=E8=A1=8C git log --oneline <=E6=82=A8=E7=BF=BB=E8=AF= =91=E7=9A=84=E8=8B=B1=E6=96=87=E6=96=87=E6=A1=A3=E8=B7=AF=E5=BE=84>=EF=BC= =8C=E5=B9=B6=E6=9B=BF=E6=8D=A2=E4=B8=8A=E8=BF=B0=E5=86=85=E5=AE=B9 + # =E8=AF=B7=E6=89=A7=E8=A1=8C git log --no-merges --oneline <=E6=82=A8=E7= =BF=BB=E8=AF=91=E7=9A=84=E8=8B=B1=E6=96=87=E6=96=87=E6=A1=A3=E8=B7=AF=E5=BE= =84> + # =E5=B9=B6=E6=9B=BF=E6=8D=A2=E4=B8=8A=E8=BF=B0=E5=86=85=E5=AE=B9=E3=80= =82=E6=B3=A8=E6=84=8F=EF=BC=9A=E5=BA=94=E5=BC=95=E7=94=A8=E5=AE=9E=E9=99=85= =E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9=E7=9A=84 commit=EF= =BC=8C + # =E8=80=8C=E9=9D=9E merge commit =20 Signed-off-by: Yanteng Si # =E5=A6=82=E6=9E=9C=E6=82=A8=E5=89=8D=E9=9D=A2=E7=9A=84=E6=AD=A5=E9=AA= =A4=E6=AD=A3=E7=A1=AE=E6=89=A7=E8=A1=8C=EF=BC=8C=E8=AF=A5=E8=A1=8C=E4=BC=9A= =E8=87=AA=E5=8A=A8=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=90=A6=E5=88=99=E8=AF=B7=E6= =A3=80=E6=9F=A5 gitconfig =E6=96=87=E4=BB=B6 --=20 2.53.0