Menu
Linear Git workflow, rebase discipline, and the land procedure.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Use xagent from Codex to launch cross-provider review and worker subagents, especially Claude review passes and Cursor/GPT worker comparisons.
Use packaged xagent from Codex to launch cross-provider review and worker subagents from any active repository.
Convert an OpenSpec change into a Superpowers implementation plan and optionally execute it with subagent-driven development; use when replacing openspec apply with a Superpowers plan-and-execute workflow.
Launch the Sheaf services for human smoke testing through Conductor, with assets sourced from the main repo.
User context, collaboration preferences, dictation constraints, and how to treat a likely typo.
Follow explicit keyboard-style instructions without adjacent initiative.
Based on SOC occupation classification
| name | git-workflow |
| description | Linear Git workflow, rebase discipline, and the land procedure. |
| metadata | {"managedBy":"sheaf-agents-installer","source":"projects/agents/global/skills/git-workflow"} |
Use this skill when creating branches, rebasing, landing work, or interpreting the user's Git workflow instructions.
Follow a linear Git doctrine.
main stays clean. Do not develop directly on main unless explicitly
instructed. Create a worktree for feature work.
When creating a worktree, first use the active harness's native managed worktree
feature if one is available. For Codex, prefer the Codex desktop managed
thread/worktree tooling over manually running git worktree and choosing a
directory.
Never merge. Never use merge commits as part of normal development or landing.
Definitions:
rebase means rebase the current working branch on main.land means archive with OpenSpec if you're applying an OpenSpec change,
rebase the working branch on main, fast-forward main to the working
branch, identify any services changed by the landed work, delete the working
branch, delete the worktree, push main, then rebuild and redeploy the
changed services from main.When landing an OpenSpec change, first verify the change is actually ready for archiving. If artifacts or tasks are incomplete, or the archive workflow would require confirmation to proceed despite incomplete work, stop and do not continue with the land until the change is ready to archive.
Landing procedure:
main.main to the working branch.main.main.