Why does the skill require a Task ID?

Standardized commit messages with Task IDs ensure traceability and better documentation within professional development environments.

How does this skill prevent data loss during a squash?

It follows a strict Backup-Verify-Cleanup pattern, creating a timestamped backup branch and running a diff verification before deleting the backup.

Can I squash commits that aren't at the tip of my branch?

Yes, the skill automatically detects commit position and uses an Interactive Rebase workflow to safely handle mid-history squashes.

What happens if a squash goes wrong?

The skill includes error recovery steps, such as using the created backup branch or the Git reflog to restore your branch to its original state.

Git Squash & Clean

Name: Git Squash & Clean
Author: cowwoc

bycowwoc

•

Developer Tools

Streamlines Git history by safely squashing multiple commits into a single entry with automated backups and verification.

This skill provides a fail-safe framework for squashing Git commits, ensuring your project history remains clean and readable without the risk of data loss. It automatically handles branch backups, selects the optimal workflow—using soft resets for tip-of-branch commits or interactive rebasing for mid-history changes—and enforces best practices for commit messaging. Designed for developers who prioritize a professional commit log, this skill ensures every squash is verified against a backup before the temporary files are cleaned up.

Key Features

01Enforces standardized commit messages with mandatory Task IDs

02Intelligent workflow selection based on commit position in history

03Pre-commit verification checks to ensure no changes are lost

04Automated Backup-Verify-Cleanup safety pattern to prevent data loss

052 GitHub stars

06Supports both soft reset and interactive rebase methodologies

Use Cases

01Reorganizing commit history while maintaining absolute data integrity

02Consolidating 'work in progress' or 'fix typo' commits into a single logical change

03Cleaning up messy feature branches before submitting a Pull Request

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add cowwoc/claude-code-cat git-squash

For use in Claude.ai and ChatGPT

Download Skill