Git Toolkit

Execute a complete, standards-compliant git commit. Invoke immediately whenever the user says "commit", "make a commit", "commit these changes", "let's commit", "ship this", "stage and commit", or any phrase that signals they want to record changes to git history. Do not wait for the user to specify format details — own the full workflow: staging, linting, message authoring, approval when the commit is standalone, and execution. If in doubt, invoke it — a bad commit message is permanent history.

Apply the correct branch naming convention before creating a new git branch or worktree. Invoke whenever the user says "create a branch", "new branch", "branch off", "checkout -b", "switch to a new branch", "create a worktree", "new worktree", "worktree for X", or any phrase where a new branch or worktree is about to be created. Also invoke when the user wants to rename or review an existing branch whose name does not follow the convention. Propose the name before executing.

Analyzes a branch's commit history and produces a squash plan for interactive rebase — a markdown file with a table of every commit, its recommended action (pick, squash, or fixup), and the reasoning, preserving atomicity and bisectability throughout. Invoke immediately whenever the user says "suggest squashes", "squash plan", "clean up my branch", "compact the history", "squash commits before merge", "prepare branch for PR", "organize commits", or mentions wanting fewer commits before merging or opening a PR. Don't wait for the user to specify a target branch — default to main and proceed. The output is a ready-to-use reference for running git rebase -i.

Resolves git conflicts in progress — for both rebases and merges. Invoke immediately whenever the user says "help with rebase", "rebase conflict", "merge conflict", "I have conflicts", "rebase is stuck", "resolve this conflict", "rebase went wrong", or is mid-rebase or mid-merge and needs guidance on what to keep. Don't wait for the user to ask explicitly — if git status shows conflict markers or a rebase/merge is active, invoke this skill. Analyzes the commit history of every branch involved via parallel sub-agents to understand each side's intent before touching any conflict marker.