메뉴
Use when handling local Git CLI daily operations such as checking status or diff, staging files, creating conventional commits, restoring local changes, reverting commits, or resolving merge/rebase/cherry-pick conflicts.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
Use when explaining code, answering technical questions, comparing approaches, or providing repository-grounded analysis without entering an implementation or remediation workflow.
Use when evaluating system architecture, platform design, or high-level technical structure to identify production risks, evidence gaps, and prioritized remediation without directly redesigning or implementing the system.
Use when improving internal code structure without intentionally changing externally observable behavior, such as module splits, simplification, dependency cleanup, or maintainability and performance-oriented restructuring.
Use when feature ideas, issues, stakeholder notes, or partial specs need to be reviewed and turned into a concise, testable PRD with clear scope, user stories, acceptance criteria, and explicit open decisions.
Use when a PRD, feature spec, or acceptance criteria already exist and need to be turned into a concise test plan and traceable test cases with clear priorities, coverage, and execution focus.
Use when reviewing pull requests, diffs, patches, or repository files to identify merge-blocking issues, important risks, and evidence gaps without directly fixing the reviewed artifact.
| name | git |
| description | Use when handling local Git CLI daily operations such as checking status or diff, staging files, creating conventional commits, restoring local changes, reverting commits, or resolving merge/rebase/cherry-pick conflicts. |
| argument-hint | [本地 git 请求，例如 status / add path / commit / restore file / revert sha / resolve conflict] |
面向本地 Git 日常操作的生产级 SOP。要求执行简单、显式、基于证据。
!git branch --show-current 2>/dev/null && git log --oneline -5 2>/dev/null
!git status --short --branch 2>/dev/null | head -20
status 和 diff 检查本地变更git add 暂存文件restore 撤销本地未提交改动revert 撤销已提交历史fetch、pull、push在任何写操作前，先做这些检查：
git rev-parse --is-inside-work-treegit status --short --branchgit diff --staged --stat.git/MERGE_HEAD.git/rebase-merge.git/rebase-apply.git/CHERRY_PICK_HEAD规则：
GIT_PAGER=cat把请求明确归到一个意图：
inspect：status、diff、变更检查、staged 和 unstaged 诊断stage：add、暂存文件、暂存部分 hunks、为 commit 做准备commit：生成提交信息、检查 staged diff、创建 commitundo：restore 或 revertresolve-conflict：merge、rebase、cherry-pick 冲突处理如果请求混合了多个意图，按顺序执行，并明确报告每个边界。
preflight -> classify -> execute or gate -> verify -> report
execute：可直接执行的安全读操作，或目标明确的低风险暂存gate：任何会丢失工作区内容、创建 commit、或结束冲突流程的动作verify：在声称成功前，运行最小但有效的后续检查report：输出命令、结果摘要、下一步和最终状态inspect默认命令：
git status --short --branchgit diff --statgit diff --staged --stat只有摘要不足时，才升级到完整 diff。
行为：
stage默认命令：
git add <path>git add -p <path>规则：
git add .commit目标：根据 staged diff 生成一条准确的 Conventional Commit。
必走流程：
git diff --staged --statblocked 停止git diff --staged，用于准确推导提交信息git commit -m "<message>"，且 message 必须与已展示并确认的完整内容一致提交规则：
type 只用：feat|fix|refactor|docs|style|test|choretypesubject 使用祈使句，简短，不带句号body 和 footer 仅在确实能提升清晰度时才加Made-with:、Generated-by:、Co-Authored-By: 中指向 Cursor、Claude、OpenAI、Anthropic 或其他 AI agent / tool 的内容body、footer 或 trailer；只有用户明确逐字要求，或仓库强制策略要求时，才可加入非 AI 署名 trailerundo支持的操作：
git restore <path>git restore --staged <path>git restore --source=<rev> <path>git revert <sha>规则：
restore 都必须显式确认revert 在执行前都必须显式确认revert，不要改写历史resolve-conflict目标：用最小语义改动完成当前 merge、rebase 或 cherry-pick。
必走流程：
git diff --name-only --diff-filter=Ugit merge --continuegit rebase --continuegit cherry-pick --continue规则：
ours 或 theirsblocked 停止## 意图
<inspect|stage|commit|undo|resolve-conflict>
## 预检查
<分支、工作区摘要、staged 摘要、相关冲突上下文>
## 执行动作
<已执行或已准备执行的命令>
## 结果
<关键输出摘要、影响文件、生成的 commit message、或已解决冲突>
## 下一步
<最小下一动作，或停止原因>
---
status: <success|partial|blocked|waiting_confirmation>
硬规则：
waiting_confirmationadd 目标无效：停止，并报告错误路径commit 时 staged diff 为空：以 blocked 停止restore 目标不清：停止，并要求明确 scope 或 pathrevert 目标不清：停止，并要求提供 commit SHAresolve-conflict 缺少冲突上下文：停止，并说明未检测到活跃的 merge、rebase 或 cherry-pick