Linux Documentation
 help / color / mirror / Atom feed
From: Weijie Yuan <wy@wyuan.org>
To: Alex Shi <alexs@kernel.org>, Yanteng Si <si.yanteng@linux.dev>,
	 Dongliang Mu <dzm91@hust.edu.cn>,
	Jonathan Corbet <corbet@lwn.net>,
	 Shuah Khan <skhan@linuxfoundation.org>,
	 Randy Dunlap <rdunlap@infradead.org>,
	Wu XiangCheng <bobwxc@email.cn>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] docs/zh_CN: update maintainer/configure-git.rst translation
Date: Sun, 23 Aug 2026 23:13:12 +0800	[thread overview]
Message-ID: <20260823-configure-git-v1-1-3c65eefcc585@wyuan.org> (raw)

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 <wy@wyuan.org>
---
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-bea33b2ece54@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
 
 :Original: Documentation/maintainer/configure-git.rst
@@ -5,58 +7,32 @@
 :译者:
 
  吴想成 Wu XiangCheng <bobwxc@email.cn>
+ 袁维杰 Weijie Yuan <wy@wyuan.org>
 
-.. _configuregit_zh:
+配置 Git
+========
 
-Git配置
-=======
+本章介绍维护者级别的 Git 配置。
 
-本章讲述了维护者级别的git配置。
-
-Documentation/maintainer/pull-requests.rst 中使用的标记分支应使用开发人员的
-GPG公钥进行签名。可以通过将 ``-u`` 标志传递给 ``git tag`` 来创建签名标记。
-但是,由于 *通常* 对同一项目使用同一个密钥,因此可以设置::
+拉取请求中使用的带标签分支(参见 Documentation/maintainer/pull-requests.rst)
+应使用开发者的 GPG 公钥签名。向 ``git tag`` 传递 ``-u <key-id>`` 可以创建签名标签。
+不过,由于你对同一项目 *通常* 会使用同一个密钥,因此可以在配置中设置该密钥并使用 ``-s``
+选项。使用以下命令设置默认的 ``key-id``::
 
 	git config user.signingkey "keyname"
 
-或者手动编辑你的 ``.git/config`` 或 ``~/.gitconfig`` 文件::
+也可以手动编辑你的 ``.git/config`` 或 ``~/.gitconfig`` 文件::
 
 	[user]
 		name = Jane Developer
 		email = jd@domain.org
 		signingkey = jd@domain.org
 
-你可能需要告诉 ``git`` 去使用 ``gpg2``::
+你可能需要让 ``git`` 使用 ``gpg2``::
 
 	[gpg]
 		program = /path/to/gpg2
 
-你可能也需要告诉 ``gpg`` 去使用哪个 ``tty`` (添加到你的shell rc文件中)::
+你可能还需要告诉 ``gpg`` 使用哪个 ``tty`` (将其添加到 shell 的 rc 文件中)::
 
 	export GPG_TTY=$(tty)
-
-
-创建链接到lore.kernel.org的提交
--------------------------------
-
-http://lore.kernel.org 网站是所有涉及或影响内核开发的邮件列表的总存档。在这里
-存储补丁存档是推荐的做法,当维护人员将补丁应用到子系统树时,最好提供一个指向
-lore存档链接的标签,以便浏览提交历史的人可以找到某个更改背后的相关讨论和基本
-原理。链接标签如下所示:
-
-	Link: https://lore.kernel.org/r/<message-id>
-
-通过在git中添加以下钩子,可以将此配置为在发布 ``git am`` 时自动执行:
-
-.. 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


             reply	other threads:[~2026-08-23 15:13 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-23 15:13 Weijie Yuan [this message]
2026-08-24  1:59 ` [PATCH] docs/zh_CN: update maintainer/configure-git.rst translation Alex Shi
2026-08-24  5:47   ` Weijie Yuan
2026-08-24 13:20 ` Jonathan Corbet
2026-08-24 13:32   ` Weijie Yuan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260823-configure-git-v1-1-3c65eefcc585@wyuan.org \
    --to=wy@wyuan.org \
    --cc=alexs@kernel.org \
    --cc=bobwxc@email.cn \
    --cc=corbet@lwn.net \
    --cc=dzm91@hust.edu.cn \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rdunlap@infradead.org \
    --cc=si.yanteng@linux.dev \
    --cc=skhan@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox