Delegate independent tasks to specialized agents working concurrently with isolated context.
jj:squash
Squash changes from working copy into relevant ancestor commits
SKILL.md
Full skill instructions
Squash Changes Into Ancestors
Move changes from the current working copy into appropriate ancestor commits.
Process
- Run
jj diff --summaryandjj diff --statfor overview - Run
jj log -r ::@- --limit 15to see candidate ancestor commits - Analyze changes:
- Small (≤5 files, ≤200 lines): run
jj diffdirectly - Large: use
/jj-contextfor structured summary
- Small (≤5 files, ≤200 lines): run
- Match changes to commits by path and commit descriptions
- Execute squashes
Basic Usage
Without options, jj squash moves all changes from @ into its parent:
jj squash # squash @ into @-
Whole Files
jj squash --into <change-id> path/to/file.py # -t is short for --into
jj squash --into <change-id> "src/**/*.py" # glob pattern
jj squash --into @-- # into grandparent
Sub-File Chunks
For extracting specific hunks (not whole files):
-
Save original @ change ID:
jj log -r @ --no-graph -T 'change_id' -
Create intermediate commit:
jj new --insert-before @ -
Write only the hunks for target commit (use Edit tool)
-
Squash into target:
jj squash --into <target-change-id> -
Return to rebased @ and remove duplicated hunks:
jj edit <rebased-@-change-id> -
Restore working copy:
jj new
Notes
- Always use change IDs (e.g.,
ksrmwuon) not commit IDs - they're stable across rewrites - After squashing, @ remains as working copy (empty if all changes moved)
More Other skills
brand-guidelines
Applies Anthropic's official brand colors and typography to any sort of artifact that may benefit from having Anthropic's look-and-feel. Use it when brand colors or style guidelines, visual formatting, or company design standards apply.
theme-factory
Toolkit for styling artifacts with a theme. These artifacts can be slides, docs, reportings, HTML landing pages, etc. There are 10 pre-set themes with colors/fonts that you can apply to any artifact that has been creating, or can generate a new theme on-the-fly.
internal-comms
A set of resources to help me write all kinds of internal communications, using the formats that my company likes to use. Claude should use this skill whenever asked to write some sort of internal communications (status reports, leadership updates, 3P updates, company newsletters, FAQs, incident reports, project updates, etc.).
Fundamental design principles for writing maintainable, testable Python code.
responsive-design
Modern responsive layouts using container queries, fluid typography, CSS Grid, and mobile-first strategies.
Generate Playwright tests from scenarios using interactive browser exploration and validation.
Automated website exploration and test case generation using Playwright.
Modern React state management with Redux Toolkit, Zustand, Jotai, and React Query for every state category.
gdpr-data-handling
GDPR-compliant data handling with consent management, data subject rights, and privacy controls.
Python error handling patterns including input validation, exception hierarchies, and partial failure handling. Use when implementing validation logic, designing exception strategies, handling batch processing failures, or building robust APIs.
refactor-plan
Detailed multi-file refactor planning with safety checks and rollback guidance.
