
Branch strategy, commit discipline, PR hygiene, and release versioning for agent-driven development. Keeps AI-generated changes manageable, reviewable, and reversible at high speed.
/git-workflow-and-versioning Split my working tree into clean atomic commits
What you get
- Branch strategy and commit discipline your agent follows automatically
- Splitting messy working trees into atomic, reviewable commits
- PR hygiene and release versioning conventions
Good fit
- Any coding session with more than one logical change
- Cleaning up a messy working tree before review
- Cutting releases with proper changelogs
Not for
- Merge conflict resolution specifics
- Choosing a git hosting provider
- Repository
- addyosmani/agent-skills
- Stars
- 0
- Category
- Coding
- Skills inside
- 1
Exclusive content
Hosted on SkillStack — full markdown, yours after purchase.
--- name: git-workflow-and-versioning description: Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, splitting uncommitted work in a messy working tree into clean atomic commits, opening or reviewing a pull request (PR), pushin…
Unlock the full content
Buy it once and keep it forever, or subscribe for access to everything.
Premium subscribers get this included.
Download & install
What's new: Initial SkillStack curated release: original MIT-licensed content repackaged as an install-ready ZIP with attribution.
Free for signed-in users.
1. Download the ZIP
Use the button above to download the packaged skill. It contains the SKILL.md plus all supporting files.
2. Unzip into your agent's skills folder
Extract the archive so that SKILL.md sits directly inside a folder named after the skill:
unzip git-workflow-and-versioning-v1.0.0.zip -d ~/.claude/skills/git-workflow-and-versioning/Skills folder per agent
- Claude Code
- ~/.claude/skills
- Cursor
- ~/.cursor/skills
- Codex
- ~/.codex/skills
- GitHub Copilot
- ~/.copilot/skills
3. Restart your agent
Your agent picks up the new skill automatically on next launch. Ask it what it can do.
FAQ
Is this one of Matt Pocock's agent skills?
Not directly — it's a different branch of the same Agent Skills movement Matt Pocock helped popularize. For Pocock's own methodology see Matt Pocock's Agent Skills, Explained; the one skill in our catalog sourced directly from his collection is diagnosing-bugs.
Reviews
- CoolEF · 2.10.2026
this skill is very useful and cool
Related skills
Code Review & Quality
addyosmani/agent-skills
Multi-axis code review with severity gates (Critical/High/Medium/Low) across correctness, readability, architecture, security, and performance. By Addy Osmani (Google Chrome). Nothing merges without a verdict.
Claude Code · Codex · Cursor · Copilot
Diagnosing Bugs
mattpocock/skills
A battle-tested diagnosis loop for hard bugs and performance regressions: reproduce → minimise → hypothesise → instrument → fix → regression-test. Includes a human-in-the-loop helper script. From a working engineer's daily setup.
Claude Code · Codex · Cursor
Test-Driven Development
obra/superpowers
RED-GREEN-REFACTOR with iron laws: write the test first, watch it fail, then write the minimal code to pass. Turns your agent into a disciplined TDD practitioner that never ships untested code.
Claude Code · Codex · Cursor · Copilot +1
Systematic Debugging
obra/superpowers
Stop guessing at fixes. A 4-phase root-cause discipline (reproduce → isolate → hypothesize → verify) that forces your coding agent to find the real cause before touching code. The most-copied debugging skill in the Agent Skills ecosystem.
Claude Code · Codex · Cursor · Copilot +1