How does this skill avoid interactive terminal issues?

It uses programmatic rebase plans via the git-hex utility, allowing Claude to modify commits directly without triggering an interactive system editor.

Can I undo a cleanup operation if I make a mistake?

Yes, the skill includes a safety feature called git-hex-undoLast which can restore your branch to its state prior to the last rewrite operation.

Is it safe to use this skill on shared team branches?

No, this skill rewrites Git history. You should only use it on private feature branches that you control, never on shared or protected branches like main or develop.

What is the benefit of using fixup over squash?

Fixup merges changes into a previous commit and automatically discards the temporary commit message, resulting in a cleaner history with less manual editing.

How does it handle merge conflicts during a rebase?

The skill includes a conflict check tool to estimate issues before starting. If a rebase pauses due to conflicts, Claude will notify you to hand off to a conflict resolution workflow.

Git History Clean & Rebase

Name: Git History Clean & Rebase
Author: yaniv-golan

byyaniv-golan

デプロイメントとDevOps

Automates Git history management by squashing, reordering, and rebasing commits to create polished, review-ready feature branches.

概要

The Git-hex Branch Cleanup skill leverages the git-hex toolkit to manage complex Git history operations directly within Claude, eliminating the need for manual interactive rebasing. It enables users to squash fixup commits, split large changes into logical units, and rebase branches onto main branches safely using built-in undo capabilities and rebase planning. This skill is ideal for developers looking to maintain a professional, legible commit history without the friction of terminal-based editor hangs or manual Git commands.

主な機能

Logical commit splitting to separate unrelated changes
Automated rebasing onto main or target branches with autostash support
0 GitHub stars
Safety-first recovery via git-hex backup refs and undo functionality
Pre-emptive rebase planning and conflict estimation
Non-interactive history rewriting including squash, fixup, and reword

ユースケース

Splitting a monolithic work-in-progress commit into focused, reviewable segments
Rebasing a stale feature branch onto main while automatically squashing fixup commits
Cleaning up messy local commit history before submitting a Pull Request

概要

主な機能

Logical commit splitting to separate unrelated changes
Automated rebasing onto main or target branches with autostash support
0 GitHub stars
Safety-first recovery via git-hex backup refs and undo functionality
Pre-emptive rebase planning and conflict estimation
Non-interactive history rewriting including squash, fixup, and reword

ユースケース

Splitting a monolithic work-in-progress commit into focused, reviewable segments
Rebasing a stale feature branch onto main while automatically squashing fixup commits
Cleaning up messy local commit history before submitting a Pull Request