squash-suggester

Included with Lifetime

$97 forever

Analyzes a branch's commit history and produces a squash plan for interactive rebase — a markdown file with a table of every commit, its recommended action (pick, squash, or fixup), and the reasoning, preserving atomicity and bisectability throughout. Invoke immediately whenever the user says "suggest squashes", "squash plan", "clean up my branch", "compact the history", "squash commits before merge", "prepare branch for PR", "organize commits", or mentions wanting fewer commits before merging or opening a PR. Don't wait for the user to specify a target branch — default to main and proceed. The output is a ready-to-use reference for running git rebase -i.

Writing & Docs

What this skill does


# Squash Suggester

Analyze the current branch's commit history and produce a squash plan that preserves atomicity
and bisectability. Delegates the analysis to `squash-planner` and writes the result as a
markdown file the user can review before running the interactive rebase.

## Step 1 — Determine branches and merge base

```bash
git branch --show-current
git log --oneline -1
```

Identify:
- **Current branch** — the branch being analyzed
- **Target branch** — where this branch will eventually merge into

If a target branch was passed as `$ARGUMENTS`, use it. Otherwise, check for a configured
upstream (`git rev-parse --abbrev-ref @{upstream}` strips the remote prefix), then fall back
to `main` or `master` (whichever exists):

```bash
git rev-parse --abbrev-ref @{upstream} 2>/dev/null   # may print "origin/main"
git branch --list main master                         # fallback detection
```

Compute the merge base:

```bash
git merge-base <target-branch> <current-branch>
```

If the merge base equals the current branch tip, the branch has zero commits ahead of the
target — report this and stop.

## Step 2 — Invoke squash-planner

Invoke the `squash-planner` agent with:

- **Branch to analyze**: the current branch name
- **Merge base**: the SHA from Step 1
- **Target branch**: for display context in the report

The agent reads every commit in the range, groups them by semantic intent, and returns a
complete squash plan with pick/squash/fixup assignments and bisect safety notes.

## Step 3 — Write the squash plan file

Save the agent's output as:

```
squash-plan-<current-branch>.md
```

Place it in the repository root. If the branch name contains `/` (e.g., `feat/auth-refactor`),
replace `/` with `-` in the filename.

The file must contain exactly what the agent produced:
- A table with columns: **SHA**, **Message preview**, **Action**, **Reasoning**
- A bisect safety section

Do not paraphrase or summarize the agent's output — write it verbatim.

## Step 4 — Report to the user

Tell the user:
- The file path where the plan was saved
- The `git rebase -i` command to use:
  ```bash
  git rebase -i <merge-base-sha>
  ```
- A reminder: the rebase editor lists commits oldest-first; the plan table matches that order

Do not execute the rebase. This skill only produces the plan — the user applies it.

Files: 1

Size: 3.0 KB

Complexity: 18/100

Category: Writing & Docs

Source: https://github.com/diegopherlt/dotclaudefiles/tree/main/plugins/git-toolkit/skills/squash-suggester

Related in Writing & Docs

jax-development

Included

Use this skill when the user is writing, debugging, profiling, refactoring, reviewing, benchmarking, parallelising, exporting, or explaining JAX code, or when they mention JAX, jax.numpy, jit, grad, value_and_grad, vmap, scan, lax, random keys, pytrees, jax.Array, sharding, Mesh, PartitionSpec, NamedSharding, pmap, shard_map, Pallas, XLA, StableHLO, checkify, profiler, or the JAX repo. It helps turn NumPy or PyTorch-style code into pure functional JAX, fix tracer/control-flow/shape/PRNG bugs, remove recompiles and host-device syncs, choose transforms and sharding strategies, inspect jaxpr/lowering/IR, and benchmark compiled code correctly.

Writing & Docsscripts

nature-article-writer

Included

Drafts, rewrites, diagnostically critiques, and style-calibrates primary research manuscripts for Nature and Nature Portfolio journals. Use when the user wants a Nature-style title, summary paragraph or abstract, introduction, results, discussion, methods, figure legends, presubmission enquiry, cover letter, reviewer response, or when a scientific draft sounds generic, jargon-heavy, structurally weak, or AI-ish and needs precise, broad-reader-friendly prose without inventing data, analyses, or references. Best for primary research articles and letters rather than reviews or press releases unless explicitly adapting one.

Writing & Docsscripts

deckrd

Included

Document-driven framework that derives requirements, specifications, implementation plans, and executable tasks from goals through structured AI dialogue. Use when user says "write requirements", "create spec", "plan implementation", "derive tasks", "structure this feature", "break down into tasks", or "document this module". Also use for reverse engineering existing code into docs (/deckrd rev). Do NOT use for direct code writing — use /deckrd-coder after tasks are generated. Do NOT use when the user only wants to run or fix existing code without planning.

Writing & Docsscripts

clinical-decision-support

Included

Generate professional clinical decision support (CDS) documents for pharmaceutical and clinical research settings, including patient cohort analyses (biomarker-stratified with outcomes) and treatment recommendation reports (evidence-based guidelines with decision algorithms). Supports GRADE evidence grading, statistical analysis (hazard ratios, survival curves, waterfall plots), biomarker integration, and regulatory compliance. Outputs publication-ready LaTeX/PDF format optimized for drug development, clinical research, and evidence synthesis.

Writing & Docsscripts

handling-sf-data

Included

Salesforce data operations with 130-point scoring. Use this skill to create, update, delete, bulk import/export, generate test data, and clean up org records using sf CLI and anonymous Apex. TRIGGER when: user creates test data, performs bulk import/export, uses sf data CLI commands, needs data factory patterns for Apex tests, or needs to seed/clean records in a Salesforce org. DO NOT TRIGGER when: SOQL query writing only (use querying-soql), Apex test execution (use running-apex-tests), or metadata deployment (use deploying-metadata).

Writing & Docsscripts

accelint-ac-to-playwright

Included

Convert and validate acceptance criteria for Playwright test automation. Use when user asks to (1) review/evaluate/check if AC are ready for automation, (2) assess if AC can be converted as-is, (3) validate AC quality for Playwright, (4) turn AC into tests, (5) generate tests from acceptance criteria, (6) convert .md bullets or .feature Gherkin files to Playwright specs, (7) create test automation from requirements. Handles both bullet-style markdown and Gherkin syntax with JSON test plan generation and validation.

Writing & Docsscripts