[Git] Use when asked to "commit", "stage and commit", "save changes", or after completing implementation tasks. Flag: --push (a.k.a. "commit and push") stages + commits + pushes to remote in one shot.
[Git] Use when asked to "commit", "stage and commit", "save changes", or after completing implementation tasks. Flag: --push (a.k.a. "commit and push") stages + commits + pushes to remote in one shot.
Quick Summary
Goal: Stage changes and create well-structured git commits following Conventional Commits format.
Workflow:
Analyze Changes — Run git status/diff to understand staged and unstaged changes
Stage Changes — Add relevant files (specific or all)
Generate Message — Detect type (feat/fix/refactor/etc.), extract scope from paths, write subject, and add a detailed body structured as purpose/kind → what changed → how it works
Write a detailed body — purpose/kind → what changed → how it works — so the next human reading git log/git blame understands the change without opening the diff. As detailed as the change needs (wrap ~72 chars); no title-only commits for non-trivial changes
Stop after the commit; push only when the user explicitly requests it (or passes --push / says "commit and push" → stage + commit + push via git-manager)
Never commit secrets, credentials, or .env files
Never use --amend or unless explicitly requested
--no-verify
Include Generated with [Claude Code] attribution footer
Be skeptical. Apply critical thinking, sequential thinking. Every claim needs traced proof, confidence percentages (Idea should be more than 80%).
Git Commit Skill
Stage changes and create well-structured git commits following Conventional Commits format.
IMPORTANT: Bypass git-commit-block Hook
Before running any git add or git commit commands, create the marker file to bypass the git-commit-block hook:
# Check current status (never use -uall flag)
git status
# See staged changes
git diff --cached
# See unstaged changes
git diff
# Check recent commit style
git log --oneline -5
Step 2: Stage Changes
# Stage all changes
git add .
# Or stage specific files
git add <file-path>
Step 2.5: Docs-Update Triage
Before committing, check if staged files impact documentation:
Run git diff --name-only --cached to list staged files
Check if any staged file matches doc-impact patterns (resolve the concrete backend/frontend source paths from the project's structure reference / docs/project-config.json):
changes under the backend service source paths (per project config) → may impact docs/specs/
.claude/skills/** → may impact .claude/docs/skills/
.claude/hooks/** → may impact .claude/docs/hooks/
.claude/workflows.json → may impact CLAUDE.md workflow table
changes under the frontend app source paths (per project config) → may impact frontend pattern docs
If matches found: invoke /docs-update skill, then re-stage any doc changes with git add
If no matches: skip (log "No doc-impacting files staged")
Step 3: Generate Commit Message
Analyze staged changes and generate message following Conventional Commits:
<type>(<scope>): <subject>
<detailed summary of changes>
Type Detection
Change Pattern
Type
New file/feature
feat
Bug fix, error handling
fix
Code restructure
refactor
Documentation only
docs
Tests only
test
Dependencies, config
chore
Performance improvement
perf
Formatting only
style
Scope Rules
Extract from file paths:
{configured-source-root}/auth/ → auth
.claude/skills/ → claude-skills
libs/{shared-lib}/ → {shared-lib}
Multiple unrelated areas → omit scope
Subject Rules
Imperative mood ("add" not "added")
Lowercase start
No period at end
Max 50 characters
Body Rules (MANDATORY) — write so a human understands fastest
Body is the deliverable. Optimize for the next person running git log / git blame — they understand the change without opening the diff. As detailed as the change needs; no artificial brevity limit — wrap ~72 chars, stop once nothing new said. Title-only commit FORBIDDEN for any non-trivial change. — why: the diff shows WHAT; the body must carry WHY + HOW, which the diff cannot.
Structure body in three parts (omit a part only when genuinely empty):
Purpose / kind — Name what kind of change and why it exists: feature, bug fix (state symptom removed), enhancement, refactor (state behaviour-preserving), perf, security, chore. 1–2 sentences answering "what problem does this solve?".
What changed — Concrete edits grouped by behaviour (not by file). Each bullet specific to behaviour/files touched — NEVER vague lines ("update code", "fix stuff", "minor fixes").
How it works / why this way — The part reviewers need. Explain mechanism, key logic, invariants relied on, edge cases preserved, and any non-obvious decision ("did X instead of obvious Y because Z"). Focus non-obvious — never narrate boilerplate. Ordering/timing/security-review invariant or subtle failure mode → call out explicitly.
Teach-the-reader mindset (from the understand skill): cover BOTH high-level motivation (why it matters) AND low-level logic (business rules, edge cases). Surface what a reader would NOT guess from the diff — write the explanation you would want to receive.
Detail dial — scale body to the change:
Change size
Body depth
Trivial (typo, rename, formatting)
Purpose line + 1 bullet; skip "how it works"
Normal (feature/fix, single area)
Purpose + 2–5 "what" bullets + a short "how it works"
Complex (cross-cutting, subtle bug)
Purpose + grouped "what" + a full "how it works" that spells out the key invariant / edge case / why-this-over-that
Step 4: Commit
Use HEREDOC for proper formatting:
git commit -m "$(cat <<'EOF'
type(scope): subject
- summarize key change 1 with intent
- summarize key change 2 with impact
Generated by AI
EOF
)"
Step 5: Verify
git status
git log -1
Examples
feat(order): add warehouse filter to list
- add warehouse query parameter in order list endpoint
- wire frontend filter control to request payload
- update tests for filtered and unfiltered list behavior
fix(validation): handle empty date range
- guard null/empty date inputs before parsing
- return validation message instead of throwing format exception
Critical Rules
ALWAYS stage all unstaged changes before committing — run git add . (or specific files) so nothing is left behind
Stop after the commit; push to remote only when the user explicitly requests it
Review staged changes before committing
Never commit secrets, credentials, or .env files
Never usegit commit --amend unless explicitly requested AND the commit was created in this session AND not yet pushed
Never skip hooks with --no-verify unless explicitly requested
Commit message MUST include a Conventional Commit title AND a detailed body — purpose/kind → what changed → how it works. As detailed as the change needs (wrap ~72 chars); title-only commit FORBIDDEN for non-trivial changes
Optimize body for the next human reading git log / git blame — surface the non-obvious (key logic, invariants, edge cases, why-this-over-that), not just a list of touched files
Include attribution footer: Generated by AI
Push & PR Operations
Arg --push (a.k.a. "commit and push"): stage all changes + create the commit + push to remote in one shot — spawn git-manager immediately after committing to push. This is the former standalone stage-commit-push entry point folded into commit; it adds no logic beyond the push delegation already described below.
This skill handles commit by default. Push-to-remote and pull request creation are delegated to git-manager sub-agent (subagent_type: "git-manager").
Spawn git-manager after committing when user says "push", "create PR", or "open PR".
Sub-Agent Type Override
MANDATORY: Push and PR operations spawn git-manager sub-agent (subagent_type: "git-manager"), NOT the main agent.
Rationale:git-manager enforces conventional commits, prevents hook bypasses, and handles PR creation with structured summaries.
Related
changelog
branch-comparison
[IMPORTANT] Use TaskCreate to break ALL work into small tasks BEFORE starting — including tasks for each file read. This prevents context loss from long files. For simple tasks, AI MUST ATTENTION ask user whether to skip.
Sub-Agent Selection — Full routing contract: .claude/skills/shared/sub-agent-selection-guide.mdRule: Route specialized domains (architecture, security, performance, DB, E2E, integration-test, git) to the matching specialist agent (see guide above) — NEVER use code-reviewer for these. — why: code-reviewer lacks each domain's checklist, so specialized issues slip through.
AI Mistake Prevention — Failure modes to avoid on every task:
Re-read files after context changes. Context compaction, resume, or long-running work can make memory stale; verify current files before acting.
Verify generated content against source evidence. AI hallucinates APIs, names, claims, and document facts. Check the relevant source before documenting or referencing.
Check downstream references before deleting or renaming. Removing an artifact can stale docs, generated mirrors, configs, and callers; map references first.
Trace the full impact chain after edits. Changing a definition can miss derived outputs and consumers. Follow the affected chain before declaring done.
Verify ALL affected outputs, not just the first. One green check is not all green checks; validate every output surface the change can affect.
Assume existing values are intentional — ask WHY before changing. Before changing a constant, limit, flag, wording, or pattern, read nearby context and history.
Surface ambiguity before acting — don't pick silently. Multiple valid interpretations require an explicit question or stated assumption with risk.
Keep shared guidance role-relevant. Universal guidance must help every receiving skill or agent; code-specific obligations belong only in code-specific protocols.
Critical Thinking Mindset — Apply critical thinking, sequential thinking. Every claim needs traced proof, confidence >80% to act.
Anti-hallucination: Never present guess as fact — cite sources for every claim, admit uncertainty freely, self-check output for errors, cross-reference independently, stay skeptical of own confidence — certainty without evidence root of all hallucination.
MUST ATTENTION apply critical + sequential thinking — every claim needs appropriate traced evidence (file:line for repo/code claims; source URL or artifact section for research, product, content, and docs claims); confidence >80% to act, <60% DO NOT recommend. Anti-hallucination: never present guess as fact, admit uncertainty freely, cross-reference independently, stay skeptical of own confidence.
MUST ATTENTION apply AI mistake prevention — verify generated content against evidence, trace downstream references before deleting or renaming, verify all affected outputs, re-read files after context loss, and surface ambiguity before acting.
Closing Reminders
Protocols in force (concise digest of the SYNC/shared blocks this skill carries):
Sub-Agent Selection: route specialized domains to the matching specialist; NEVER code-reviewer.
AI Mistake Prevention: verify generated content against evidence, trace downstream references, verify all affected outputs, re-read after context loss, surface ambiguity.
Critical Thinking: traced file:line proof per claim; confidence >80% to act, never guess.
MANDATORY IMPORTANT MUST ATTENTION break work into small todo tasks using TaskCreate BEFORE starting
MANDATORY IMPORTANT MUST ATTENTION search codebase for 3+ similar patterns before creating new code
MANDATORY IMPORTANT MUST ATTENTION cite file:line evidence for every claim (confidence >80% to act)
MANDATORY IMPORTANT MUST ATTENTION add a final review todo task to verify work quality
[TASK-PLANNING] Before acting, analyze task scope and systematically break it into small todo tasks and sub-tasks using TaskCreate.