From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 0E2DD1862A for ; Sun, 19 Apr 2026 13:32:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776605537; cv=none; b=Pwwdj4YCfyACgVObdC1/wCLbksWmryrRi8U27AAKb+ivBKbWNoMSVr9ZheaRQWPeF0m0Tprwz2BGw4dFfoJijzDjBtgQn/BGO07lEVqvFGWy05BXLPEVxJ6rQdJzcBhust/1mhjziR7L+7CYhIn67Yv3ViKfYw+oNoY2kC2yPVc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776605537; c=relaxed/simple; bh=Ip0d5DBUyVPoheUjyQr7rQwV+qiRzFMzu6K11BbxV18=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Lp49yHgL0uwXOq/y7pcd8jANdXfLznRn1yFRO5Io3V2Pju/MzBLxCx7CoKaUfiOTkOe2/qm3d5/XKCWn08mI8YrXiAQ210XIurvJ4z07HgsOP6M0e3LOA1SfOSayQGhjyeEFFChGQhHZbEjoUyjGjb6miq3CF9D8cn+4+TXN1P4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=F29PskMG; arc=none smtp.client-ip=209.85.216.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F29PskMG" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-35d99031e4eso1433467a91.1 for ; Sun, 19 Apr 2026 06:32:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776605535; x=1777210335; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=G3DpD3/Bkr5HjkEtcV7j+/UczsLnwKJAPJ6W22c8oNg=; b=F29PskMGj4eQzTgN20iO9LcseuPyHzLs9b7IxnP3iy2R7ZMqR/0gy/ZgLMqvPhfHLa 6glJp2gEnL7IQwhEuDr5ACSojJniuKMEGB984etacVgMNcoWEu+PArMFXrqpaN6KC62R +xsVHchF+aGIsiwrjNCqgET8rpxJ7DeYhLa8J+DKqB/U1vo+Zz0kWakUVIhjKc1AVoko DGcfM+468KRRv2qu0c8OKP/dPybIR5zzFeUgnFPqpANVcKxbTU9WVL6d9rtjHR3zXiEG 3+JK1EAWtLVImakMmlDOhJOIwDUGkhuHpS8OOAdTkD5dJqINkMZKYgtpCCHf02XB4tB0 ZpFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776605535; x=1777210335; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=G3DpD3/Bkr5HjkEtcV7j+/UczsLnwKJAPJ6W22c8oNg=; b=RYXxJV9Vo2FGwZUBGPrLYpVS88PZj7W3aHK48JwzqJWxWBESrKN31wWn/tBpdURXSO SVY5IEwCJfYnpksKeZ3GDKjwuH8Ngq70fyQiW0TMRiBGlgI75fLHG6qLoSl5gJDUtvdT FA4YSbsXvNlcVRPX/oa++8my4tK3dltq9hXDhDX5yZ9N4kjZdXh5gVzBE5JfsanUWzh6 bKbQcc23+/xSIc7HISE6ntII1201MGOzvHWY8SLbqXWfu7Nhe9w+ciw2lAiXWR8TaJ/P r0YHrZ3wgpE3rH6DUVt+Vr08fUeRgwMlc5tIKxIhvMyLazS5Oyf7i5ivFTcLGZEYwEMG 7UmA== X-Forwarded-Encrypted: i=1; AFNElJ8HKzBKWNxA/67Qvceg0xTPAFatuuomqOFCbRDWhLaWOKdrYb4eL+UuM+2KgETE1WRLWl2LS217vZUQgF8=@vger.kernel.org X-Gm-Message-State: AOJu0YzMeKlTAC2N8zUEragiC1W44bAmMI8iDoBjFDyV3LO63XeKjY1K NybQdg+DyqDfIQUhwvwWssxqlkytB0AfCTPe6MFqqWAI6r6rQhVAQFGN X-Gm-Gg: AeBDievnG/QAgfmO99ku7W1ltEIaihISoWrvnLpsqZqTts8AdtOO+emEPAhmW/3EQsY QB/T9jMYlGNLNU2dPCrP447afdpRRPPnUO7vL09BNMED/Ok7L2KPgvLdq5sVXGYJZFFE1MBj/of Iy2EijRfi1nC32dMRrCgip41BSK7c7mKkxvr3Q2Em2Q4YSE/MHOqqwIlK7Y+rjEuJOfzLRqmcmO NruVmQR1Rdp8Xd/IwkvQLpqQ7MI0ApmHJjy4/bnS0pX7lrwbbnuy7w9y5rIf4+XBQUZ0H/+MIot Ulb5eGU1DCEnEhWfu3xpec2lQKd/9z0rw+3bsACNkswEd82xKG+PeKlPlc6pI6DIs5EV+p4Nddr VH0ze/hlzjlt9sx7/DhGvVXn1P34xiZFIl2qQdYS3ZLZ8eNJtDEC7rkhciGL6hOX+I2I2z6IwuU HpV4yqEa910GuPXgwJLUFoVqVFn67k3mKH+aHyAV+76sqy5BBwaf0/Yv9lgW4WKXgZPqXzSNqus DU= X-Received: by 2002:a17:90a:e7d0:b0:35c:1695:24a3 with SMTP id 98e67ed59e1d1-361404945e0mr11011086a91.23.1776605535354; Sun, 19 Apr 2026 06:32:15 -0700 (PDT) Received: from ?IPV6:240e:38b:d99:bc01:3499:eb40:121b:8539? ([240e:38b:d99:bc01:3499:eb40:121b:8539]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fa9ff90dsm73698045ad.11.2026.04.19.06.32.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Apr 2026 06:32:14 -0700 (PDT) Message-ID: <74d5a331-9b44-43ae-90a6-8099b65f4845@gmail.com> Date: Sun, 19 Apr 2026 21:32:06 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] docs/zh_CN: add --no-merges to git log example in how-to.rst To: Ben Guo , Alex Shi , Yanteng Si , Dongliang Mu , Jonathan Corbet Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, hust-os-kernel-patches@googlegroups.com References: <20260416042647.3646595-1-ben.guo@openatom.club> Content-Language: en-US From: Alex Shi In-Reply-To: <20260416042647.3646595-1-ben.guo@openatom.club> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Applied thanks! On 2026/4/16 12:26, 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 > --- > 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 > # 如果您前面的步骤正确执行，该行会自动显示，否则请检查 gitconfig 文件 > -- 2.53.0