fixup-commit

Create fixup commits and run autosquash rebase on a target branch.

8|Updated Oct 26, 2025
One-click install
npx skills add https://github.com/sasamuku/dotfiles --skill fixup-commit
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: fixup-commit
Source: https://github.com/sasamuku/dotfiles/tree/main/.claude/skills/fixup-commit
Command: npx skills add https://github.com/sasamuku/dotfiles --skill fixup-commit

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires git, and includes scripts (resource) components.

What problem does it solve?

This Skill automates the creation of fixup commits and the execution of an autosquash rebase, simplifying the process of cleaning up and consolidating commits in your repository.

Core Features & Use Cases

  • Fixup Commit Creation: Automatically creates fixup commits for specified target commits.
  • Interactive Rebase with Autosquash: Performs a rebase with autosquash for the target branch.
  • Use Case: Ideal for maintaining a clean commit history, especially after merging feature branches where fixup commits can tidy up related changes.

Quick Start

To create a fixup commit for a specific commit and rebase with autosquash, use the 'fixup-commit' skill with the commit hash as the argument, like this:

fixup-commit <commit-hash>

Frequently Asked Questions about fixup-commit

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automate fixup commits and rebase to clean up git branch history?

To automate fixup commits and clean up git branch history, you can run a command that targets a specific commit hash. The process automatically creates a fixup commit and performs an interactive rebase with autosquash to consolidate related changes.

What is an autosquash rebase and when do I need it for commit cleaning?

An autosquash rebase is a git mechanism that automatically organizes fixup commits next to their original targets. You need it for commit cleaning when you want to squash related changes into a single commit to maintain a tidy repository history.

How do I use a commit hash to squash changes with an interactive rebase?

To squash changes using a commit hash, pass the target hash as an argument to the automation command. This creates a dedicated fixup commit and triggers the interactive rebase with autosquash to merge the changes into the original commit.

Do I need git installed to automate fixup commits and rebasing?

Yes, you need git installed to automate fixup commits and rebasing. The Skill relies entirely on git's native interactive rebase and autosquash features to execute the branch history cleanup.

What is the best way to tidy up related commits after merging a feature branch?

The best way to tidy up related commits after merging a feature branch is to create fixup commits for specific changes and then run an autosquash rebase. This consolidates related modifications into one clean commit.

Can I consolidate multiple commits into one without manual interactive rebase editing?

Yes, you can consolidate multiple commits into one without manual editing by automating fixup commit creation and executing an interactive rebase with autosquash. This automatically reorders and squashes the designated commits into their targets.