Is it safe to squash commits that have already been pushed?

No. You should only squash local, unpushed commits. The skill includes safety checks to verify if commits have been pushed to avoid rewriting public history.

What is the difference between squash and fixup?

Squash merges a commit into the previous one and prompts you to edit the message, while fixup merges the commit but discards its individual message.

When should I use the /squash command?

You should use it after completing a feature or a TDD cycle to merge small 'work-in-progress' commits into a single, meaningful commit before pushing to a shared repository.

Can I undo a squash if I make a mistake?

Yes, the skill provides guidance on using /squash abort during the process or using git reflog to restore your branch to its state before the rebase started.

Git Commit History Squash

Name: Git Commit History Squash
Author: TashanGKD

byTashanGKD

•

開発者ツール

Simplifies Git history by merging multiple small commits into meaningful, production-ready feature commits.

The Git Commit History Squash skill provides a guided workflow for cleaning up fragmented Git histories, specifically designed for developers using Test-Driven Development (TDD) or incremental coding cycles. It facilitates the transformation of multiple micro-commits into clean, logical functional units through automated safety checks, interactive rebase guidance, and recovery tools. By ensuring that only local, unpushed commits are modified, it helps maintain a professional and readable repository log while preventing the accidental disruption of shared branch history.

主な機能

01Pre-flight safety checks to prevent squashing already pushed commits

022 GitHub stars

03Rebase recovery tools including abort and reflog restoration

04Repository optimization via integrated garbage collection commands

05Interactive rebase guidance for merging N-most recent commits

06Automated fixup and soft-reset workflows for quick merging

ユースケース

01Maintaining a clean, linear project history in collaborative environments

02Consolidating fragmented TDD commit cycles before opening a pull request

03Merging minor fixes and typo corrections into primary feature commits

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add tashangkd/cc_plugins squash

For use in Claude.ai and ChatGPT