git-hex

Rewrite git branch history. Invoke for any commit manipulation: squash, reword, reorder, drop, split, fold fixups, amend, or rebase onto main. Handles "clean up my commits", "squash before PR", "fix commit message typo", "make branch reviewable", "fold in fixup commits", "drop a commit", "rebase my branch". Operates on existing commits using git-hex MCP tools — no interactive rebase needed. NOT for: merge conflicts, cherry-picks across branches, conflict checking, git concepts, or hooks setup.

Use whenever a git operation is mid-flight and needs help finishing. Triggers: "continue the rebase", "abort the rebase", "conflicts in files", "rebase stopped/stuck/paused", "cherry-pick conflict", "revert has conflicts", "merge conflict", git status showing unmerged paths, or any git-hex tool returning paused/conflict/conflictingFiles status. Helps resolve conflicting files one by one, then continue or abort the operation. Applies to rebase, merge, cherry-pick, and revert — but only when already in progress. NOT for starting new rebases, creating PRs, squashing, fixup commits, undoing completed operations, or git-hex setup.

Trigger whenever the user's message contains "PR", "pull request", or "review feedback" — regardless of what else they ask for. This includes: "open a PR", "create a PR", "prepare for PR", "update my PR", "clean up and open a pull request", "address review comments", "reviewer wants", "PR #number". Even if the request also involves squashing, rebasing, or fixing commits, trigger this skill as long as a PR or review is part of the goal. Do NOT trigger for local-only git work (squash, amend, cherry-pick, rebase, conflict resolution) where no pull request or code review is mentioned. Do NOT trigger for branch protection rules or repo settings.