Files

Defame1297 0fde892f20 refactor(git-branches): retrofit to the ADR-0020 context contract

Description 612 -> 273 chars, body 1124 -> 457 words. Branch patterns,
operations, merging, comparison, and the orchestrator contract move to
references/.

Corrects rebase routing in four places: this skill sent rebase to
git-history, which carries no rebase content and disclaims it. Rebase is
git-commits'; cherry-pick and revert stay git-history's. Drops a Step 3
gate on a rebase flow this skill does not have.

2026-08-30 13:10:53 +00:00

1.9 KiB

Raw Blame History

git-branches

Manage the full lifecycle of git branches — create, switch, delete, rename, track, merge, and compare feature/hotfix/release branches under GitHub Flow or Gitflow.

What it does

This skill handles branch operations within the git workflow suite. It creates branches following GitHub Flow or Gitflow conventions (configurable), switches and tracks branches, handles safe deletion with unmerged-work checks, and retrieves branch intent metadata for use by other skills (e.g., commit message context). It returns structured results suitable for agent composition.

Usage

/git-branches

Describe your branch task: create a feature/hotfix/release branch, switch, delete, rename, track, merge, or compare two branches. The skill will determine the branching pattern (GitHub Flow or Gitflow) from config or repo state and handle safety checks for destructive operations.

Files

File	Purpose
`SKILL.md`	Skill instructions for agents
`references/branch-patterns.md`	Loaded when a branch's base, name prefix, or merge rule depends on GitHub Flow vs. Gitflow
`references/branch-operations.md`	Loaded when running a create/switch/delete/rename/track/list action, or resolving `get-intent`
`references/merging.md`	Loaded when merging one branch into another or resolving merge conflicts
`references/comparing-branches.md`	Loaded when comparing two branches or finding where they diverged
`references/orchestrator-contract.md`	Loaded when `git-orchestrate` or another calling agent supplies a structured request rather than prose
`references/sources.md`	Research sources backing the branching/gitflow guidance

Composition

git-orchestrate calls this skill for the branch step of a multi-step workflow and parses its structured result. Cherry-pick and revert are git-history's; commit authoring and rebase are git-commits'; branch operations against a Gitea-hosted remote are gitea-branches'.

1.9 KiB Raw Blame History