Skip to content
cccskills
FreePublished on GitHub

diff

Analyze branch diff against merge-base — stat overview, full diff, file list, commit list, or branch overlap check. Always uses merge-base to exclude main's forward progress.

The English summary is being prepared. Showing the original description.

See how to install

Files included (1)

  • SKILL.md1.8 KB

SKILL.md (original)

Review the instructions the agent will receive before you install.

Diff Skill

Analyze the current branch's diff against its merge-base with main.

Usage

/diff             # Stat overview (default)
/diff full        # Full patch output
/diff files       # List changed files only
/diff commits     # List commits on this branch
/diff overlap feature/other-branch  # Check for file overlap with another branch

⚠️ Critical: Always Use Merge-Base

# CORRECT — only shows YOUR changes
git diff $(git merge-base main HEAD)..HEAD

# WRONG — includes main's forward progress as noise
git diff main

Instructions

Determine action from $ARGUMENTS:

ArgumentAction
stat or (empty)git --no-pager diff $(git merge-base main HEAD)..HEAD --stat
fullgit --no-pager diff $(git merge-base main HEAD)..HEAD | head -200
filesgit --no-pager diff $(git merge-base main HEAD)..HEAD --name-only
commitsgit --no-pager log $(git merge-base main HEAD)..HEAD --oneline
overlap <branch>Cross-branch file overlap check (see below)

Cross-Branch Overlap Check:

BRANCH_A_FILES=$(git --no-pager diff $(git merge-base main HEAD)..HEAD --name-only)
BRANCH_B_FILES=$(git --no-pager diff $(git merge-base main <other-branch>)..<other-branch> --name-only)
# Show files that appear in both
comm -12 <(echo "$BRANCH_A_FILES" | sort) <(echo "$BRANCH_B_FILES" | sort)

Report Format

For stat/default mode, report:

  1. Files changed (count)
  2. Lines added / removed
  3. Any files that look unexpectedly large (>200 lines changed)
  4. Any test files missing for changed source files

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

ask

Free

Route a codebase question to the right tool — structural graph, semantic search, or risk analysis. Use when you need to find or understand code without knowing exact file names.

The English summary is being prepared. Showing the original description.

brain-bootstrap/claude-code-brain-bootstrap11Updated Apr 25, 2026

Auto-configure CLAUDE.md and claude/ knowledge docs for a new project. Use when setting up Brain Bootstrap in a new repository. Discovers the codebase, fills in templates, and writes project-specific configuration.

The English summary is being prepared. Showing the original description.

brain-bootstrap/claude-code-brain-bootstrap11Updated Apr 25, 2026

Use before any new feature, component, or behavioral change — when you need to explore requirements and design before writing code

The English summary is being prepared. Showing the original description.

brain-bootstrap/claude-code-brain-bootstrap11Updated Apr 25, 2026

Activate safety guards for the session. Use /careful before critical operations — blocks rm -rf, DROP TABLE, git push --force, kubectl delete namespace, docker system prune via PreToolUse hook.

The English summary is being prepared. Showing the original description.

brain-bootstrap/claude-code-brain-bootstrap11Updated Apr 25, 2026

Generate a user-facing changelog from git commits — categorize, filter noise, translate to user language. Runs in isolated fork context.

The English summary is being prepared. Showing the original description.

brain-bootstrap/claude-code-brain-bootstrap11Updated Apr 25, 2026

Save session state before context gets full or before ending. Writes current task state, branch, and loaded docs to claude/tasks/todo.md so the next session can resume cleanly.

The English summary is being prepared. Showing the original description.

brain-bootstrap/claude-code-brain-bootstrap11Updated Apr 25, 2026

See all skills by brain-bootstrap

Report a problem with this skill