What is the difference between fixup and squash in this workflow?

'Fixup' merges a commit into the previous one and discards the message, while 'squash' merges it but allows you to combine or edit the messages into a single coherent description.

Why can't I just use git rebase -i with Claude?

Standard interactive rebasing requires a manual TTY editor interface which causes automated environments like Claude Code to hang; this skill uses a file-based editor to bypass that limitation.

Is it safe to rewrite history with this skill?

Yes. The skill includes a mandatory verification step that compares the final rebased state against your original HEAD to ensure no code was lost or accidentally altered.

What happens if there are merge conflicts during the rebase?

If a conflict occurs, the process pauses, allowing you to resolve the files manually before using git rebase --continue, or you can choose to abort the rebase entirely.

Git Rebase & Squash (Non-Interactive)

Name: Git Rebase & Squash (Non-Interactive)
Author: ylt

byylt

0•

开发者工具

Cleans up and reorganizes Git commit history using an automated, non-interactive rebase workflow designed for AI environments.

This skill provides a robust framework for managing Git commit history within automated or non-interactive terminal environments where traditional interactive commands would fail. It automates the complex process of identifying merge bases, generating file-based rebase plans, and squashing multiple messy commits into a clean, professional structure. By utilizing a scripted sequence editor, it allows Claude to safely restructure branches, reword messages, and optimize repository history while ensuring code integrity through mandatory diff verification against the original state.

主要功能

01Smart merge-base detection to automatically find the correct branch divergence point.

02Customizable squash strategies that present multiple organizational options to the user.

03Support for advanced Git operations including fixup, squash, reword, and drop commands.

040 GitHub stars

05Automated non-interactive Git rebase using GIT_SEQUENCE_EDITOR to prevent terminal hangs.

06Mandatory safety verification by diffing rebased history against the original HEAD.

使用场景

01Tidying up a 'Work in Progress' branch with many micro-commits before opening a Pull Request.

02Reorganizing commit history to separate infrastructure changes from feature logic for cleaner reviews.

03Performing complex history rewrites in remote or automated environments where interactive TTY is unavailable.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add ylt/claude-plugins git-rebase-squash

For use in Claude.ai and ChatGPT

Download Skill