From nobody Mon Sep 28 10:43:33 2026 Received: from mta1.migadu.com (out-157.mta1.migadu.com [95.215.58.157]) (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 057D130B509 for ; Sun, 23 Aug 2026 15:13:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787498021; cv=none; b=fq9hZu6fi2OKemM4TDNCE5ipACqQ0YIwNnf3MEl/E00oJg8bmDITmQmUu/stEF5PWXPR0Lejm9vPkPbKXlR+Iqeti4d0tAJmcoiIZMgmD7mtGyYIHCMRpC6Q3hPvbt1CzVQve0XgTc3a+IIsSQgFY99KsItC0SmIFpV7wopQZPY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787498021; c=relaxed/simple; bh=2M0QRvtfvFMUeBwd9Ss6zo57jCKj/Jz/kXzCVsW9mO0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=FL9G8/zMaJHb6mBotdDaIIP4vaLO4Z1w2yqJYQX/Gpbn1GV+4RhfTNl2G3g6NpykG0HrxrKV+mIh8Ukj1oAMyVL0AC2Ppj5i/4dEPK5dXLpMl+ZTccDCRIOZ6kenwSo2TtAE6a5Dit8nmfZhDhJ88o42FhjyOJEYjAO8Er1+A8w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org; spf=pass smtp.mailfrom=wyuan.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b=tRP6yc9k; arc=none smtp.client-ip=95.215.58.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wyuan.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wyuan.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wyuan.org header.i=@wyuan.org header.b="tRP6yc9k" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=2M0QRvtfvFMUeBwd9Ss6zo57jCKj/Jz/kXzCVsW9mO0=; c=simple/simple; d=wyuan.org; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787498017; v=1; x=1788102817; b=tRP6yc9k5q/Qod3V40KJtospJAHbsft/vgTJWlyPOrnSyHObnuCsxv27csVYMUCLTAGHBN1t Yqj+ypnDt4pFixZyxjjeZT7s8cNDzN7ugdlX8DL3jTNCSpmcxIJe4gZmEGC/5uVO5lP8B2a8qgj GmiPYNdkTl76DcdVltnHxAJJbHfyo9m0cBbZpN+XuNX4qfOFd1PKpNV0Z7xCio/M/gibppg1LBL BmsAA+kpgFOTyIDYDokVtv4QYfCSfWVecCJLKGoFU/UfWJGuYIJRzxMNKNBUdpHyFjK/CuDVq0k MWj5T7SX9EAfForE7sf4oAT2bGPkgG/g+4ia1ep8Fi6jg== X-Envelope-To: linux-kernel@vger.kernel.org Received: from yuanweijie-macmini-2058.local (117.176.242.187) by smtp.migadu.com with ESMTPS id 62bd571366acaf64; Sun, 23 Aug 2026 15:13:27 +0000 X-Mizu-Trace-ID: 62bd571366acaf64 X-Migadu-Flow: FLOW_OUT From: Weijie Yuan Date: Sun, 23 Aug 2026 23:13:12 +0800 Subject: [PATCH] docs/zh_CN: update maintainer/configure-git.rst translation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260823-configure-git-v1-1-3c65eefcc585@wyuan.org> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/yXMQQqAIBBA0avErBPMSKqrRAu10aaFhWYE0d2zW r7F/xdEDIQR+uKCgAdFWn1GVRZgZuUdMpqyQXAheStqZlZvyaWAzNHOZCsVKt5p22jIzRbQ0vn 9hvF3THpBs78TuO8HlcVrA3EAAAA= X-Change-ID: 20260823-configure-git-686aea09bf5b To: Alex Shi , Yanteng Si , Dongliang Mu , Jonathan Corbet , Shuah Khan , Randy Dunlap , Wu XiangCheng Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.17-dev Upstream documented the common 'git tag -s' workflow and cleaned up unneeded RST markup. It briefly updated the automatic lore Link: hook for Git 2.41 and HTTPS, then removed that guidance because Link: tags should only point to useful additional information. Add a SPDX-License-Identifier. Remove a useless top-of-file label, as Jon always tries to do. Update the translation through commit 944df7a31452 ("docs: update the guidance for Link: tags"). Signed-off-by: Weijie Yuan --- Hi Jon, I added a SPDX-License-Identifier for this file while the original English one doesn't have one yet. Should I do that? / Is it "legal" to do so? , if XiangCheng would be happy with what I'm doing. Also the same concern: https://lore.kernel.org/linux-doc/20260823-maintainer-pgp-guide-v2-3-bea33b= 2ece54@wyuan.org/ Thanks. --- .../zh_CN/maintainer/configure-git.rst | 50 ++++++------------= ---- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/Documentation/translations/zh_CN/maintainer/configure-git.rst = b/Documentation/translations/zh_CN/maintainer/configure-git.rst index a45ea736f73b..41a1fc0ae884 100644 --- a/Documentation/translations/zh_CN/maintainer/configure-git.rst +++ b/Documentation/translations/zh_CN/maintainer/configure-git.rst @@ -1,3 +1,5 @@ +.. SPDX-License-Identifier: GPL-2.0 + .. include:: ../disclaimer-zh_CN.rst =20 :Original: Documentation/maintainer/configure-git.rst @@ -5,58 +7,32 @@ :=E8=AF=91=E8=80=85: =20 =E5=90=B4=E6=83=B3=E6=88=90 Wu XiangCheng + =E8=A2=81=E7=BB=B4=E6=9D=B0 Weijie Yuan =20 -.. _configuregit_zh: +=E9=85=8D=E7=BD=AE Git +=3D=3D=3D=3D=3D=3D=3D=3D =20 -Git=E9=85=8D=E7=BD=AE -=3D=3D=3D=3D=3D=3D=3D +=E6=9C=AC=E7=AB=A0=E4=BB=8B=E7=BB=8D=E7=BB=B4=E6=8A=A4=E8=80=85=E7=BA=A7= =E5=88=AB=E7=9A=84 Git =E9=85=8D=E7=BD=AE=E3=80=82 =20 -=E6=9C=AC=E7=AB=A0=E8=AE=B2=E8=BF=B0=E4=BA=86=E7=BB=B4=E6=8A=A4=E8=80=85= =E7=BA=A7=E5=88=AB=E7=9A=84git=E9=85=8D=E7=BD=AE=E3=80=82 - -Documentation/maintainer/pull-requests.rst =E4=B8=AD=E4=BD=BF=E7=94=A8=E7= =9A=84=E6=A0=87=E8=AE=B0=E5=88=86=E6=94=AF=E5=BA=94=E4=BD=BF=E7=94=A8=E5=BC= =80=E5=8F=91=E4=BA=BA=E5=91=98=E7=9A=84 -GPG=E5=85=AC=E9=92=A5=E8=BF=9B=E8=A1=8C=E7=AD=BE=E5=90=8D=E3=80=82=E5=8F= =AF=E4=BB=A5=E9=80=9A=E8=BF=87=E5=B0=86 ``-u`` =E6=A0=87=E5=BF=97=E4=BC=A0= =E9=80=92=E7=BB=99 ``git tag`` =E6=9D=A5=E5=88=9B=E5=BB=BA=E7=AD=BE=E5=90= =8D=E6=A0=87=E8=AE=B0=E3=80=82 -=E4=BD=86=E6=98=AF=EF=BC=8C=E7=94=B1=E4=BA=8E *=E9=80=9A=E5=B8=B8* =E5=AF= =B9=E5=90=8C=E4=B8=80=E9=A1=B9=E7=9B=AE=E4=BD=BF=E7=94=A8=E5=90=8C=E4=B8=80= =E4=B8=AA=E5=AF=86=E9=92=A5=EF=BC=8C=E5=9B=A0=E6=AD=A4=E5=8F=AF=E4=BB=A5=E8= =AE=BE=E7=BD=AE:: +=E6=8B=89=E5=8F=96=E8=AF=B7=E6=B1=82=E4=B8=AD=E4=BD=BF=E7=94=A8=E7=9A=84= =E5=B8=A6=E6=A0=87=E7=AD=BE=E5=88=86=E6=94=AF=EF=BC=88=E5=8F=82=E8=A7=81 Do= cumentation/maintainer/pull-requests.rst=EF=BC=89 +=E5=BA=94=E4=BD=BF=E7=94=A8=E5=BC=80=E5=8F=91=E8=80=85=E7=9A=84 GPG =E5=85= =AC=E9=92=A5=E7=AD=BE=E5=90=8D=E3=80=82=E5=90=91 ``git tag`` =E4=BC=A0=E9= =80=92 ``-u `` =E5=8F=AF=E4=BB=A5=E5=88=9B=E5=BB=BA=E7=AD=BE=E5=90= =8D=E6=A0=87=E7=AD=BE=E3=80=82 +=E4=B8=8D=E8=BF=87=EF=BC=8C=E7=94=B1=E4=BA=8E=E4=BD=A0=E5=AF=B9=E5=90=8C= =E4=B8=80=E9=A1=B9=E7=9B=AE *=E9=80=9A=E5=B8=B8* =E4=BC=9A=E4=BD=BF=E7=94= =A8=E5=90=8C=E4=B8=80=E4=B8=AA=E5=AF=86=E9=92=A5=EF=BC=8C=E5=9B=A0=E6=AD=A4= =E5=8F=AF=E4=BB=A5=E5=9C=A8=E9=85=8D=E7=BD=AE=E4=B8=AD=E8=AE=BE=E7=BD=AE=E8= =AF=A5=E5=AF=86=E9=92=A5=E5=B9=B6=E4=BD=BF=E7=94=A8 ``-s`` +=E9=80=89=E9=A1=B9=E3=80=82=E4=BD=BF=E7=94=A8=E4=BB=A5=E4=B8=8B=E5=91=BD= =E4=BB=A4=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E7=9A=84 ``key-id``:: =20 git config user.signingkey "keyname" =20 -=E6=88=96=E8=80=85=E6=89=8B=E5=8A=A8=E7=BC=96=E8=BE=91=E4=BD=A0=E7=9A=84 `= `.git/config`` =E6=88=96 ``~/.gitconfig`` =E6=96=87=E4=BB=B6:: +=E4=B9=9F=E5=8F=AF=E4=BB=A5=E6=89=8B=E5=8A=A8=E7=BC=96=E8=BE=91=E4=BD=A0= =E7=9A=84 ``.git/config`` =E6=88=96 ``~/.gitconfig`` =E6=96=87=E4=BB=B6:: =20 [user] name =3D Jane Developer email =3D jd@domain.org signingkey =3D jd@domain.org =20 -=E4=BD=A0=E5=8F=AF=E8=83=BD=E9=9C=80=E8=A6=81=E5=91=8A=E8=AF=89 ``git`` = =E5=8E=BB=E4=BD=BF=E7=94=A8 ``gpg2``:: +=E4=BD=A0=E5=8F=AF=E8=83=BD=E9=9C=80=E8=A6=81=E8=AE=A9 ``git`` =E4=BD=BF= =E7=94=A8 ``gpg2``:: =20 [gpg] program =3D /path/to/gpg2 =20 -=E4=BD=A0=E5=8F=AF=E8=83=BD=E4=B9=9F=E9=9C=80=E8=A6=81=E5=91=8A=E8=AF=89 `= `gpg`` =E5=8E=BB=E4=BD=BF=E7=94=A8=E5=93=AA=E4=B8=AA ``tty`` =EF=BC=88=E6= =B7=BB=E5=8A=A0=E5=88=B0=E4=BD=A0=E7=9A=84shell rc=E6=96=87=E4=BB=B6=E4=B8= =AD=EF=BC=89:: +=E4=BD=A0=E5=8F=AF=E8=83=BD=E8=BF=98=E9=9C=80=E8=A6=81=E5=91=8A=E8=AF=89 `= `gpg`` =E4=BD=BF=E7=94=A8=E5=93=AA=E4=B8=AA ``tty`` =EF=BC=88=E5=B0=86=E5= =85=B6=E6=B7=BB=E5=8A=A0=E5=88=B0 shell =E7=9A=84 rc =E6=96=87=E4=BB=B6=E4= =B8=AD=EF=BC=89:: =20 export GPG_TTY=3D$(tty) - - -=E5=88=9B=E5=BB=BA=E9=93=BE=E6=8E=A5=E5=88=B0lore.kernel.org=E7=9A=84=E6= =8F=90=E4=BA=A4 -------------------------------- - -http://lore.kernel.org =E7=BD=91=E7=AB=99=E6=98=AF=E6=89=80=E6=9C=89=E6=B6= =89=E5=8F=8A=E6=88=96=E5=BD=B1=E5=93=8D=E5=86=85=E6=A0=B8=E5=BC=80=E5=8F=91= =E7=9A=84=E9=82=AE=E4=BB=B6=E5=88=97=E8=A1=A8=E7=9A=84=E6=80=BB=E5=AD=98=E6= =A1=A3=E3=80=82=E5=9C=A8=E8=BF=99=E9=87=8C -=E5=AD=98=E5=82=A8=E8=A1=A5=E4=B8=81=E5=AD=98=E6=A1=A3=E6=98=AF=E6=8E=A8= =E8=8D=90=E7=9A=84=E5=81=9A=E6=B3=95=EF=BC=8C=E5=BD=93=E7=BB=B4=E6=8A=A4=E4= =BA=BA=E5=91=98=E5=B0=86=E8=A1=A5=E4=B8=81=E5=BA=94=E7=94=A8=E5=88=B0=E5=AD= =90=E7=B3=BB=E7=BB=9F=E6=A0=91=E6=97=B6=EF=BC=8C=E6=9C=80=E5=A5=BD=E6=8F=90= =E4=BE=9B=E4=B8=80=E4=B8=AA=E6=8C=87=E5=90=91 -lore=E5=AD=98=E6=A1=A3=E9=93=BE=E6=8E=A5=E7=9A=84=E6=A0=87=E7=AD=BE=EF=BC= =8C=E4=BB=A5=E4=BE=BF=E6=B5=8F=E8=A7=88=E6=8F=90=E4=BA=A4=E5=8E=86=E5=8F=B2= =E7=9A=84=E4=BA=BA=E5=8F=AF=E4=BB=A5=E6=89=BE=E5=88=B0=E6=9F=90=E4=B8=AA=E6= =9B=B4=E6=94=B9=E8=83=8C=E5=90=8E=E7=9A=84=E7=9B=B8=E5=85=B3=E8=AE=A8=E8=AE= =BA=E5=92=8C=E5=9F=BA=E6=9C=AC -=E5=8E=9F=E7=90=86=E3=80=82=E9=93=BE=E6=8E=A5=E6=A0=87=E7=AD=BE=E5=A6=82= =E4=B8=8B=E6=89=80=E7=A4=BA=EF=BC=9A - - Link: https://lore.kernel.org/r/ - -=E9=80=9A=E8=BF=87=E5=9C=A8git=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BB=A5=E4=B8= =8B=E9=92=A9=E5=AD=90=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=B0=86=E6=AD=A4=E9=85=8D= =E7=BD=AE=E4=B8=BA=E5=9C=A8=E5=8F=91=E5=B8=83 ``git am`` =E6=97=B6=E8=87=AA= =E5=8A=A8=E6=89=A7=E8=A1=8C=EF=BC=9A - -.. code-block:: none - - $ git config am.messageid true - $ cat >.git/hooks/applypatch-msg <<'EOF' - #!/bin/sh - . git-sh-setup - perl -pi -e 's|^Message-Id:\s*]+)>?$|Link: https://lore.kernel.org/= r/$1|g;' "$1" - test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} - : - EOF - $ chmod a+x .git/hooks/applypatch-msg --- base-commit: 66fb95a521110da673090294561844c9f76ebe64 change-id: 20260823-configure-git-686aea09bf5b