Automates the tedious parts of Git workflow: generating Conventional Commits messages from your diffs, creating properly named feature and fix branches, and drafting PR descriptions with change summaries and file lists. It kicks in when you ask to commit code, create branches, or open PRs. The commit message generation is the real time saver here since it analyzes your staged changes and formats everything as `type(scope): description` automatically. Also handles interactive rebases and commit cleanup. If you're on a team that enforces commit conventions or you just want to stop writing the same boilerplate PR descriptions, this cuts out the busywork.

GitHub stars
328
last updated
May 13, 2026

Install

$ npx -y skills add laolaoshiren/claude-code-skills-zh --skill git-workflow --agent claude-code

Installs into .claude/skills of the current project.

Files

Git 工作流助手

核心原则

  • 只执行用户明确要求的 Git 动作。生成提交信息不等于暂存或提交;提交不等于推送;创建 PR 不等于合并 PR、关闭 Issue 或发布 Release。
  • 把工作树中已有、未跟踪和无关的修改视为用户资产,不覆盖、不回退、不混入本轮提交。
  • 优先使用非交互命令。涉及历史重写、冲突选择或远程覆盖时降低自动化程度。

工作流程

1. 读取仓库规则与状态

先阅读适用的 AGENTS.md、CONTRIBUTING.md、README、提交规范和 CI 说明,再检查:

git status --short --branch
git diff
git diff --cached
git log --oneline -10
git remote -v
git branch -vv

同时识别未跟踪文件、当前分支、upstream、远程差异和已有失败。不得只看 staged diff。

2. 明确动作与文件范围

把用户请求拆成独立授权:

动作默认权限
分析状态、生成 commit message 或 PR 文案只读
暂存、commit仅用户要求后执行,只选本轮相关文件
创建或切换分支仅用户明确要求时执行;实现流程需要但未获授权时,先说明原因并取得同意
fetch、push、创建 PR分别确认在请求范围内,不互相推导
merge、关闭 Issue、发布 Release必须有明确授权
rebase、修改已发布历史、强制更新远程高风险,必须明确授权并满足额外条件

存在无关改动时不得使用 git add . 或 git add -A。逐个暂存目标文件,并用 git diff --cached 复核。

3. 规划原子提交

  • 根据真实 diff 判断 feat、fix、docs、refactor、test、perf 或 chore。
  • 沿用仓库近期提交的语言、scope 和格式。
  • 一个提交只表达一项可独立理解和验证的改动。
  • Closes #123 仅在对应 Issue 确实应由该提交自动关闭时使用。

提交信息遵循:

<type>(<scope>): <简短描述>

<必要时说明原因、关键实现和兼容性>

<关联 Issue 或 Breaking Change>

4. 验证后执行

Sponsors

Details

Repository
github.com/laolaoshiren/claude-code-skills-zh
Categories
Git & Pull Requests, Automation & Workflows
License
MIT
First seen
Jun 11, 2026

More from laolaoshiren/claude-code-skills-zh

All 19
1metabase avatardocs-reviewmetabase/metabaseReview documentation changes for compliance with the Metabase writing style guide. Use when reviewing pull requests, files, or diffs containing documentation ma0skills.sh installs
2reactjs avatarreview-docsreactjs/react.devThis orchestrates parallel reviews of React documentation files by routing them through specialized agents based on file location and...0skills.sh installs
3rknall avatarPython Backend Architecture Reviewrknall/claude-skillsComprehensive design architecture review for Python backend applications. Use this skill when users ask you to review, analyze, or provide feedback on backend a0skills.sh installs
4thinkinaixyz avatarcode-reviewthinkinaixyz/deepchatComprehensive code review assistant that analyzes code quality, security, and best practices0skills.sh installs
5topoteretes avatardiff-risk-explainertopoteretes/cogneeUse to briefly explain small code diffs.0skills.sh installs
6TypedDevs avatarcommitTypedDevs/bashunitStage and commit changes using conventional commits format0skills.sh installs