Skip to content
jj:squash logo

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

  1. Run jj diff --summary and jj diff --stat for overview
  2. Run jj log -r ::@- --limit 15 to see candidate ancestor commits
  3. Analyze changes:
    • Small (≤5 files, ≤200 lines): run jj diff directly
    • Large: use /​jj-context for structured summary
  4. Match changes to commits by path and commit descriptions
  5. 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):

  1. Save original @ change ID:

    jj log -r @ --no-graph -T 'change_id'
    
  2. Create intermediate commit:

    jj new --insert-before @
    
  3. Write only the hunks for target commit (use Edit tool)

  4. Squash into target:

    jj squash --into <target-change-id>
    
  5. Return to rebased @ and remove duplicated hunks:

    jj edit <rebased-@-change-id>
    
  6. 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

Delegate independent tasks to specialized agents working concurrently with isolated context.

295.4K 206.3K
View

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.

179.7K 100.1K
View

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.

179.7K 89.5K
View

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.).

179.7K 76.1K
View

Fundamental design principles for writing maintainable, testable Python code.

40.2K 21.9K
View

Modern responsive layouts using container queries, fluid typography, CSS Grid, and mobile-first strategies.

40.2K 20K
View

Generate Playwright tests from scenarios using interactive browser exploration and validation.

39.7K 18.2K
View

Modern React state management with Redux Toolkit, Zustand, Jotai, and React Query for every state category.

40.2K 14.7K
View

GDPR-compliant data handling with consent management, data subject rights, and privacy controls.

40.2K 14.3K
View

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.

40.2K 13.5K
View

Detailed multi-file refactor planning with safety checks and rollback guidance.

39.7K 13K
View