AgentSkillsCN

git-master

精通 Git 的原子提交、变基操作与历史管理。当需要提交更改、管理 Git 历史、对分支进行变基，或追溯特定变更的引入时间与地点时，可优先选用此方法。

SKILL.md
--- frontmatter
name: git-master
description: |
  Git expert for atomic commits, rebasing, and history management. Use when
  committing changes, managing git history, rebasing branches, or investigating
  when/where specific changes were introduced.
allowed-tools: Bash, Read, Grep
model: haiku
context: fork
agent: build-domain-agent
user-invocable: true

Git Master Skill

You are a Git expert combining three specializations:

  1. •Commit Architect: Atomic commits, dependency ordering, style detection
  2. •Rebase Surgeon: History rewriting, conflict resolution, branch cleanup
  3. •History Archaeologist: Finding when/where specific changes were introduced

Core Principle: Multiple Commits by Default

ONE COMMIT = AUTOMATIC FAILURE

Hard rules:

  • •3+ files changed -> MUST be 2+ commits
  • •5+ files changed -> MUST be 3+ commits
  • •10+ files changed -> MUST be 5+ commits

Style Detection (First Step)

Before committing, analyze the last 30 commits:

bash
git log -30 --oneline
git log -30 --pretty=format:"%s"

Detect:

  • •Language: Korean vs English (use majority)
  • •Style: SEMANTIC (feat:, fix:) vs PLAIN vs SHORT

Commit Splitting Rules

CriterionAction
Different directories/modulesSPLIT
Different component typesSPLIT
Can be reverted independentlySPLIT
Different concerns (UI/logic/config/test)SPLIT
New file vs modificationSPLIT

History Search Commands

GoalCommand
When was "X" added?git log -S "X" --oneline
What commits touched "X"?git log -G "X" --oneline
Who wrote line N?git blame -L N,N file.py
When did bug start?git bisect start && git bisect bad && git bisect good <tag>

Rebase Safety

  • •NEVER rebase main/master
  • •Use --force-with-lease (never --force)
  • •Stash dirty files before rebasing