Chinese git workflow conventions including commit message generation and merge practices.

MITAuto-check passedDevelopment

Install Git Workflow Cn

skills CLI
$ npx skills add yangtaihong59/siyuan-plugins-mcp-sisyphus --skill git-workflow-cn -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install yangtaihong59/siyuan-plugins-mcp-sisyphus git-workflow-cn --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/yangtaihong59/siyuan-plugins-mcp-sisyphus.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/git-workflow-cn .claude/skills/git-workflow-cn && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
git-workflow-cn
GitHub stars
114
Token cost
~941 tokens
SKILL.md length
193 words
Files
1
Skills in repo
30
Repo updated
First seen
Licence
MIT

At a glance

Chinese git workflow conventions including commit message generation and merge practices.

  • Works in 4 steps: 查看改动范围:执行 git status 与 git diff --stat… → 阅读关键 Diff:对新增文件、核心逻辑改动执行 git diff… → 确定类型与范围:根据改动性质选择 与 。 → …
  • The user asks to write a commit
  • SKILL.md covers 一、中文 Commit Message 生成, 二、Merge 规范(默认 --no-ff) and 三、其他通用约定
  • Calls git

What it does

Git Workflow Cn is an agent skill from yangtaihong59/siyuan-plugins-mcp-sisyphus. Chinese git workflow conventions including commit message generation and merge practices. Use when the user asks to "write a commit", "generate commit message", "写commit", "写提交信息", "生成commit", or any git operation where Chinese conventions apply. Also triggers for merge requests, branch operations, or git workflow questions in Chinese.

Its SKILL.md is about 940 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow and Commit messages. It works with Git. The repository describes itself as: 一个用于连接Agent与Siyuan的工具. The licence is MIT.

When your agent uses it

  • The user asks to write a commit
  • Generate commit message
  • Any git operation where Chinese conventions apply
  • Branch operations

Example prompts

  • “write a commit”
  • “generate commit message”
  • “写commit”
  • “/git-workflow-cn”

Workflow steps

4 steps, taken from the first numbered list in SKILL.md.

  1. 查看改动范围:执行 git status 与 git diff --stat --staged,快速了解修改了哪些文件、增删行数。
  2. 阅读关键 Diff:对新增文件、核心逻辑改动执行 git diff --staged -- ,提取功能点;如果改动很多,优先阅读业务核心文件,忽略格式化、lock 文件等噪音。
  3. 确定类型与范围:根据改动性质选择 与 。
  4. 撰写消息:按下方格式输出;若用户偏好更详细版本,提供完整版与精简版两个选项。

What it can do on your machine

Read from SKILL.md and the folder at commit d2ad534. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Git Workflow Cn loads about 941 tokens when it runs. Until then it costs about 88 tokens; SKILL.md has 193 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~88
When it runs · the whole SKILL.md, loaded when a task matches
~941

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from yangtaihong59/siyuan-plugins-mcp-sisyphus at commit d2ad534, republished under its MIT licence (© yangtaihong59). 193 words, ~941 tokens.

Download SKILL.mdSave it as .claude/skills/git-workflow-cn/SKILL.md (or your agent's skills folder).
name
git-workflow-cn
description
Chinese git workflow conventions including commit message generation and merge practices. Use when the user asks to "write a commit", "generate commit message", "写commit", "写提交信息", "生成commit", or any git operation where Chinese conventions apply. Also triggers for merge requests, branch operations, or git workflow questions in Chinese.

中文 Git 工作流规范

本 skill 规范项目中所有与 Git 相关的中文输出与操作习惯,包括提交信息撰写与分支合并策略。


一、中文 Commit Message 生成

根据当前暂存区的改动,生成符合标准格式的中文 commit message。

工作流
  1. 查看改动范围:执行 git status 与 git diff --stat --staged,快速了解修改了哪些文件、增删行数。
  2. 阅读关键 Diff:对新增文件、核心逻辑改动执行 git diff --staged -- <file>,提取功能点;如果改动很多,优先阅读业务核心文件,忽略格式化、lock 文件等噪音。
  3. 确定类型与范围:根据改动性质选择 <type> 与 <scope>。
  4. 撰写消息:按下方格式输出;若用户偏好更详细版本,提供完整版与精简版两个选项。
格式规范
<type>emoji(<scope>): <subject>

- <动词> <改动点1>
- <动词> <改动点2>
- ...
type(必填)
类型Emoji含义
feat✨新功能
fix🐛修复问题
docs📝文档、注释、README 等
style💄代码格式、分号、空行等无逻辑改动
refactor♻️重构(既非新功能也非修复)
perf⚡性能优化
test✅测试相关
chore🔧构建、依赖、工具链、杂项
revert⏪回滚提交

Emoji 放在 <type> 与 (<scope>) 之间(无 scope 时紧跟 type),例如 feat✨(scope): subject 或 docs📝: subject。

scope(可选)
  • 使用模块名、包名或目录名,如 terrain_yolo_matching、projection、docs
  • 若改动跨多个大模块,可省略 scope
subject(必填)
  • 简短概括,不超过 50 个汉字
  • 句末不加句号
  • 使用祈使语气/动宾结构,如 "重构采样逻辑"、"修复内存泄漏"
body(可选但推荐)
  • 每条以动词开头:新增、修复、重构、移除、优化、补全、更新、调整、统一、引入、升级、降级
  • 每条控制在 30 字以内,聚焦单一改动点
  • 技术名词保留英文(函数名、类名、配置项、文件扩展名等),不强行翻译
  • 按重要性排序,最重要的放在最前面
  • 总条数建议 3~7 条;若改动极小(如单行修复),可省略 body,只保留 subject
注意事项
  • 不要猜测:只根据实际 diff 内容描述,不脑补未发生的改动
  • 区分主要与次要:核心逻辑改动放在前面,格式化、依赖升级、配置文件调整放在后面或省略
  • 中英混排:中文与英文单词之间留一个空格,如 单 ping 地形 patch
  • 多文件同功能:若多个文件服务于同一功能,合并为一条描述,不逐文件罗列
  • 数据/配置文件:YAML、JSON、Notebook 等配置更新用 更新配置 或 同步调整实验配置
示例
feat✨(terrain_yolo_matching): 重构投影采样与向量索引特征工程

- 新增足迹感知的单 ping 地形 patch 采样逻辑
- 向量索引支持 compact_stats_v1 / enhanced_profile_v1 特征
- 匹配评分由 cosine 相似度升级为 enhanced_profile_similarity_score
- 样本构建流程增加分阶段耗时统计
- 补全项目级 AGENTS.md 开发文档
fix🐛(projection): 修复单 ping 无有效波束时的越界采样

- 在 _valid_projection_ping_indices 中增加有限值校验
- 无有效命中时提前抛出 RuntimeError,避免传入空 patch
chore🔧: 升级 black 与 ruff 并统一代码格式

- 更新 pre-commit 配置至 v4.0
- 全库执行格式化,消除尾随空格

二、Merge 规范(默认 --no-ff)

原则

所有涉及 merge 的操作,默认使用 --no-ff(no fast-forward),以保留完整的分支历史与功能边界,便于后续回溯、回滚与代码审查。

标准命令
bash
# 合并特性分支到主分支(推荐)
git checkout main
git merge --no-ff feature/xxx

# 若需自定义合并提交信息
git merge --no-ff -m "merge✨: 合并某某功能分支" feature/xxx
例外情况

仅在以下场景允许省略 --no-ff 或使用其他合并策略:

  1. 单人本地临时分支:个人开发且未推送到远程的短期分支,可使用 fast-forward 保持历史线性
  2. 明确使用 squash merge:需要将多个提交压缩为一个时,使用 git merge --squash(但需单独提交)
  3. 执行 rebase 后合并:若已通过 git rebase main 将特性分支变基到最新主线,且用户明确要求 fast-forward
merge commit message 规范

当使用 --no-ff 产生合并提交时,message 遵循以下格式:

merge✨(<source-branch>): 合并 <source-branch> 到 <target-branch>

- 合入功能:简述该分支带来的核心改动
- 关联:#123(如有 issue / PR 编号)

若用户未指定 message,自动生成并提示确认后再执行合并。

禁止行为
  • 不要在公共主干分支上直接 fast-forward 合并功能分支,除非团队明确约定使用 rebase + ff 工作流
  • 不要生成无意义的默认 merge message(如 "Merge branch 'feat/xxx'"),应补充中文说明

三、其他通用约定

  • 分支命名:使用英文小写 + 连字符,如 feat/terrain-projection、fix/matching-bug
  • 提交前检查:鼓励先执行 git diff --cached --check 检查空白错误
  • rebase 交互式清理:在合并前,若特性分支提交历史混乱,建议使用 git rebase -i main 整理提交

© yangtaihong59, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in .agents/skills/git-workflow-cn of yangtaihong59/siyuan-plugins-mcp-sisyphus.

Open the folder on GitHubat commit d2ad534

Compare with similar skills

Git Workflow Cn next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Git Workflow Cn compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Git Workflow Cn this skillyangtaihong59/siyuan-plugins-mcp-sisyphus114—~941Automated safety check: PassMIT
ToolJet Multi-Repo CommitToolJet/ToolJet41k—~1.3kAutomated safety check: PassAGPL-3.0
Git Workflow and Versioningaddyosmani/agent-skills103k2 repos~3.5kAutomated safety check: NotesMIT
React Router Pull Request Creatorremix-run/react-router57k—~2.5kAutomated safety check: PassMIT
Saleor Commit Workflowsaleor/saleor23k—~575Automated safety check: PassBSD-3-Clause
Emoji Commit ConventionsbaptisteArno/typebot.io11k—~424Automated safety check: PassCustom licence

Similar skills

  • Commits changes across ToolJet's root repo and its server/ee and frontend/ee submodules, writing messages from the diffs and updating submodule pointers in order.

    41k GitHub stars~1.3k tokensUpdated today
    DevelopmentAuto-check passed
  • Git Workflow and Versioning

    addyosmani/agent-skills

    Sets git habits for every change: short-lived branches, atomic commits with descriptive messages, clean pull requests, plus versioning, tagging and changelogs for releases.

    103k GitHub starsUsed in 2 repos~3.5k tokens
    DevelopmentAuto-check: notes
  • React Router Pull Request Creator

    remix-run/react-router

    Packages finished React Router work into a draft pull request: branch, commit, push, a written PR body and the right GitHub labels.

    57k GitHub stars~2.5k tokensUpdated yesterday
    DevelopmentAuto-check passed
  • Commits changes in the Saleor codebase and works through pre-commit hook failures from ruff, mypy, the GraphQL schema check and the migrations check.

    23k GitHub stars~575 tokensUpdated today
    DevelopmentAuto-check passed
  • Emoji Commit Conventions

    baptisteArno/typebot.io

    Sets the repository's convention for commit messages and pull request titles: one emoji prefix for the main intent, a concise title and clean follow-up commits.

    11k GitHub stars~424 tokensUpdated 2 days ago
    DevelopmentAuto-check passed
  • Draft Pull Request Creator

    wordpress-mobile/WordPress-Android

    Commits and pushes current changes, writes a pull request title and body from the branch history and template, and opens a draft PR on GitHub after you approve it.

    3.2k GitHub stars~881 tokensUpdated yesterday
    DevelopmentAuto-check: notes

More from yangtaihong59/siyuan-plugins-mcp-sisyphus

All 30 skills in this repo
  • Siyuan Built Cjs Live Test

    yangtaihong59/siyuan-plugins-mcp-sisyphus

    使用仓库刚构建的 dist/mcp-server.cjs 与 cli/dist/cli.cjs,在真实思源实例的隔离测试笔记本中执行端到端验收。用于验证工具或 action 修改、严格安全写入、短哈希预检租约、幂等重放、状态变化拒绝、HTTP/stdio/CLI 一致性,以及用户要求“实际测试”“真实笔记本测试”“全部 action 测试”或“不要只跑 mock”时。

    114 GitHub stars~1.3k tokensUpdated 2 days ago
    Auto-check passed
  • Claude Desktop MCP App

    yangtaihong59/siyuan-plugins-mcp-sisyphus

    Configure, repair, and verify MCP servers and MCP Apps in Claude Desktop on macOS.

    114 GitHub stars~1.2k tokensUpdated 2 days ago
    Auto-check passed
  • Siyuan MCP Browse Read

    yangtaihong59/siyuan-plugins-mcp-sisyphus

    MCP playbook for browsing and reading SiYuan notes. An agent skill from yangtaihong59/siyuan-plugins-mcp-sisyphus.

    114 GitHub stars~684 tokensUpdated 2 days ago
    Auto-check passed
  • Siyuan MCP Create Edit

    yangtaihong59/siyuan-plugins-mcp-sisyphus

    MCP playbook for creating and editing SiYuan documents and blocks.

    114 GitHub stars~665 tokensUpdated 2 days ago
    Auto-check passed
  • Siyuan MCP Sisyphus

    yangtaihong59/siyuan-plugins-mcp-sisyphus

    Top-level skill for operating SiYuan Note through the Sisyphus MCP server.

    114 GitHub stars~1.3k tokensUpdated 2 days ago
    Auto-check passed
  • Siyuan MCP Timeline

    yangtaihong59/siyuan-plugins-mcp-sisyphus

    MCP playbook for SiYuan document timelines. An agent skill from yangtaihong59/siyuan-plugins-mcp-sisyphus.

    114 GitHub stars~647 tokensUpdated 2 days ago
    Auto-check passed

Works with

Categories

Questions about Git Workflow Cn

What does Git Workflow Cn do?

Chinese git workflow conventions including commit message generation and merge practices. Git Workflow Cn is an agent skill from yangtaihong59/siyuan-plugins-mcp-sisyphus. Chinese git workflow conventions including commit message generation and merge practices.

When should I use Git Workflow Cn?

Git Workflow Cn fits situations like: the user asks to write a commit; generate commit message; any git operation where Chinese conventions apply; branch operations.

How do I install Git Workflow Cn in Claude Code?

Run `npx skills add yangtaihong59/siyuan-plugins-mcp-sisyphus --skill git-workflow-cn -a claude-code`. Or copy the skill folder (.agents/skills/git-workflow-cn in yangtaihong59/siyuan-plugins-mcp-sisyphus) into .claude/skills/git-workflow-cn in your project. Claude Code loads it when a task matches its description.

How do I install Git Workflow Cn in Codex?

Run `npx skills add yangtaihong59/siyuan-plugins-mcp-sisyphus --skill git-workflow-cn -a codex`. Or copy the skill folder (.agents/skills/git-workflow-cn in yangtaihong59/siyuan-plugins-mcp-sisyphus) into .agents/skills/git-workflow-cn in your project. Codex loads it when a task matches its description.

Can I use Git Workflow Cn in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add yangtaihong59/siyuan-plugins-mcp-sisyphus --skill git-workflow-cn -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/git-workflow-cn, .gemini/skills/git-workflow-cn, .github/skills/git-workflow-cn and .opencode/skills/git-workflow-cn in your project.

What does Git Workflow Cn need to run?

Going by SKILL.md and its folder, Git Workflow Cn needs the command-line tools its instructions call (git).

Does Git Workflow Cn access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Git Workflow Cn safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Git Workflow Cn use?

Git Workflow Cn is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Git Workflow Cn use?

About 941 tokens (SKILL.md is roughly 3.8k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Git Workflow Cn?

Skills that share tags, products or a category with Git Workflow Cn: ToolJet Multi-Repo Commit (ToolJet/ToolJet, 41k stars), Git Workflow and Versioning (addyosmani/agent-skills, 103k stars), React Router Pull Request Creator (remix-run/react-router, 57k stars) and Saleor Commit Workflow (saleor/saleor, 23k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Git Workflow Cn?

yangtaihong59 (a GitHub user) maintains it in yangtaihong59/siyuan-plugins-mcp-sisyphus, which has 114 GitHub stars. The repository holds 30 skills in this directory. The repository was last updated on October 8, 2026.

Source: yangtaihong59/siyuan-plugins-mcp-sisyphus on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.