rewrite-history

Included with Lifetime

$97 forever

Rewrite branch into clean, narrative-quality commits. Creates backup, reimplements on fresh branch, verifies byte-identical, then replaces original branch history.

General

What this skill does

Rewrite the current branch's history into clean, narrative-quality commits suitable for code review.

## Goal

Transform messy development history into a logical story reviewers can follow commit-by-commit. Original branch is rewritten; backup preserved for rollback.

## Arguments

`$ARGUMENTS` = optional flags (`--auto` skips interactive approval)

## Preconditions

Abort with clear error if:

- On main/master branch
- Uncommitted changes exist
- No commits to rewrite (branch matches main)

## Execution

1. **Create backup branch**: `{branch}-backup-{timestamp}` — permanent until manually deleted
2. **Analyze the diff** between current branch and main—understand the complete change set
3. **Create temp branch** from main for clean reimplementation
4. **Plan the narrative**—structure changes into logical, self-contained commits (foundations → features → polish)
5. **Reimplement** by recreating changes commit-by-commit with conventional commit messages; use `--no-verify` for intermediate commits
6. **Verify byte-identical**: `git diff {original-branch}` MUST be empty—abort if any difference
7. **Replace original branch**: point original branch to clean history (final commit runs hooks normally)
8. **Offer to push** with `--force-with-lease`

## Verification Requirement

The byte-identical check is non-negotiable. If `git diff {backup-branch}` shows ANY difference after reimplementation:

- Abort immediately
- Report exactly what differs
- Leave backup branch intact for recovery

## Constraints

- Analyze the complete diff only—ignore original commit history
- One concern per commit—atomic, independently revertible
- Conventional commit messages: `type(scope): description`
- Never add "Co-Authored-By" or "Generated with Claude Code"
- Always use `--force-with-lease` for push (never `--force`)

## Interactive Mode

Unless `$ARGUMENTS` contains `--auto`:

- Present proposed commit plan before execution
- Allow adjustment or cancellation

## Rollback

If anything goes wrong: `git reset --hard {branch}-backup-{timestamp}`

## Output

Report commit count, backup branch name, and the new commit log.

Files: 1

Size: 2.3 KB

Complexity: 6/100

Category: General

Source: https://github.com/doodledood/claude-code-plugins/tree/main/claude-plugins/vibe-extras/skills/rewrite-history

Related in General

modeling-omnistudio-epc-catalog

Included

Salesforce Industries CME EPC product-modeling skill for Product2-based catalog creation. Use when creating EPC products, configuring product attributes, building offer bundles with Product Child Items, or reviewing EPC DataPack JSON metadata for product catalog changes. TRIGGER when: user creates or updates Product2 EPC records, AttributeAssignment payloads, AttributeMetadata/AttributeDefaultValues, Offer bundles, or ProductChildItem relationships. DO NOT TRIGGER when: designing OmniScripts/FlexCards/Integration Procedures (use building-omnistudio-omniscript, building-omnistudio-flexcard, or building-omnistudio-integration-procedure), implementing Apex business logic (use generating-apex), or troubleshooting deployment pipelines (use deploying-metadata).

Generalscripts

relationship-science-coach

Included

Use this skill for direct, practical adult relationship coaching: couples conflict, repair, trust, marriage, dating, flirting, attachment patterns, emotional connection, sex, desire differences, eroticism, kink negotiation, affection, love languages, breakups, and long-term passion. Draw on Gottman, EFT and Hold Me Tight, attachment science, modern sex research, Perel, Nagoski, Kerner, Schnarch, Love and Stosny, and flexible love-language tools. Be concrete and low-hedge. Redirect only for imminent danger, abuse, coercive control, minors, non-consent, self-harm, stalking, or medical/legal/psychiatric decisions.

Generalscripts

building-sf-integrations

Included

Salesforce integration architecture and runtime plumbing with 120-point scoring. Use this skill to set up Named Credentials, External Credentials, External Services, REST/SOAP callout patterns, Platform Events, and Change Data Capture. TRIGGER when: user sets up Named Credentials, External Services, REST/SOAP callouts, Platform Events, CDC, or touches .namedCredential-meta.xml files. DO NOT TRIGGER when: Connected App/OAuth config (use configuring-connected-apps), Apex-only logic (use generating-apex), or data import/export (use handling-sf-data).

Generalscripts

venue-templates

Included

Access comprehensive LaTeX templates, formatting requirements, and submission guidelines for major scientific publication venues (Nature, Science, PLOS, IEEE, ACM), academic conferences (NeurIPS, ICML, CVPR, CHI), research posters, and grant proposals (NSF, NIH, DOE, DARPA). This skill should be used when preparing manuscripts for journal submission, conference papers, research posters, or grant proposals and need venue-specific formatting requirements and templates.

Generalscripts

let-fate-decide

Included

Draws the 12 Houses of the Zodiac Tarot spread to inject entropy into planning when prompts are vague, ambiguous, or casually delegated. Interprets the spread to guide next steps. Use when the user says 'let fate decide', 'YOLO', 'whatever', 'idk', or other nonchalant phrases, makes Yu-Gi-Oh references, or when you are about to arbitrarily pick between multiple reasonable approaches. Prefer over ask-questions-if-underspecified when the user's tone is casual or playful rather than precision-seeking.

Generalscripts

net-ops

Included

Cross-platform network troubleshooting (Windows, macOS, Linux) via local or remote shell. Use for: DNS broken, can't resolve hostnames, nslookup/dig works but apps fail, NRPT, WFP, scutil, /etc/resolver, systemd-resolved, /etc/resolv.conf, NetworkManager, VPN DNS leak residue (ProtonVPN/Mullvad/WireGuard/AnyConnect), AV/firewall blocking DNS or DoH, Tailscale DNS interaction, intermittent connectivity, remote diagnostics over SSH.

Generalscripts