git-master

📁 rockcookies/skills 📅 9 days ago
10
总安装量
4
周安装量
#28861
全站排名
安装命令
npx skills add https://github.com/rockcookies/skills --skill git-master

Agent 安装分布

claude-code 4
openclaw 1
opencode 1
cursor 1

Skill 文档

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:

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

Detect:

  • Language: Check user intent first. If Chinese is preferred, use Chinese. Otherwise, analyze commit history to determine English (Imperative) vs. Chinese (Concise).
  • Style: SEMANTIC (feat:, fix:) vs PLAIN vs SHORT

Commit Splitting Rules

Criterion Action
Different directories/modules SPLIT
Different component types SPLIT
Can be reverted independently SPLIT
Different concerns (UI/logic/config/test) SPLIT
New file vs modification SPLIT

History Search Commands

Goal Command
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