git-workflow-and-versioning

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), pushing to a remote, or when you need to organize work across multiple parallel streams. Use when cutting a release, choosing a semantic version bump, tagging, or writing a changelog.

by addyosmani 98k GitHub stars MIT Updated Sep 20, 2026
git-workflow-and-versioning skill by addyosmani
git-workflow-and-versioning — Workflow skill by addyosmani

Overview

git-workflow-and-versioning is an open-source workflow skill for Claude Code and compatible agents, published by addyosmani. Its author describes it as: “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 reviewi…”. The project has 98k stars on GitHub and is available under the MIT license. Add it to your setup with `/plugin marketplace add addyosmani/agent-skills`.

What git-workflow-and-versioning does

Git is your safety net. Treat commits as save points, branches as sandboxes, and history as documentation. With AI agents generating code at high speed, disciplined version control is the mechanism that keeps changes manageable, reviewable, and reversible.

Best for

What’s inside

The SKILL.md for git-workflow-and-versioning is organised into these sections:

  • Overview
  • When to Use
  • Core Principles
  • Trunk-Based Development (Recommended)
  • 1. Commit Early, Commit Often
  • 2. Atomic Commits
  • 3. Descriptive Messages
  • 4. Keep Concerns Separate
  • 5. Size Your Changes
  • Branching Strategy
  • Feature Branches
  • Branch Naming

Installation

Add git-workflow-and-versioning to your agent with:

/plugin marketplace add addyosmani/agent-skills

Review a skill’s source before installing it — skills can instruct your agent to run commands. This command comes from the skill’s public repository, which is the source of truth for setup steps. New to skills? Read how to install Claude Code skills.

Supported agents

  • Claude Code — ships a claude code plugin marketplace
  • Codex — declared in the repository topics
  • Cursor — declared in the repository topics
  • Antigravity — declared in the repository topics

License

git-workflow-and-versioning is published under the MIT license.

Strengths

  • Clear MIT license — safe to read and adapt within its terms
  • Ships in addyosmani/agent-skills, an established project with 97,992 GitHub stars
  • Works with Claude Code, Codex, Cursor, Antigravity
  • Actively maintained — repository updated in the last 30 days
  • Its repository gained 16,916 GitHub stars over the last 52 days

Author

addyosmani 27 skills in the catalog · GitHub profile ↗
View skills

Topics

Alternatives to git-workflow-and-versioning

Similar skills from other repositories:

Need a skill like this, tailored to your team?Build a custom skill →

Frequently asked questions

What does git-workflow-and-versioning do?
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), pushing to a remote, or when you need to organize work across multiple parallel streams. Use when cutting a release, choosing a semantic version bump, tagging, or writing a changelog.
How do I install git-workflow-and-versioning?
Run /plugin marketplace add addyosmani/agent-skills in your agent, then reload your skills. Review the source at https://github.com/addyosmani/agent-skills before installing.
Is git-workflow-and-versioning free to use?
Yes. git-workflow-and-versioning is free and open source under the MIT license, so you can read, run, and adapt it within that license's terms.
Which agents does git-workflow-and-versioning work with?
git-workflow-and-versioning lists Claude Code, Codex, Cursor, and Antigravity — named in its SKILL.md, its plugin marketplace or its repository topics. Skills use the portable SKILL.md format, so other agents that read that format may load it too.
Where does git-workflow-and-versioning come from?
git-workflow-and-versioning ships inside addyosmani/agent-skills, a repository that contains 26 catalogued skills in total. The repository's 97,992 GitHub stars apply to that whole collection, not to this skill on its own.

Optimizes agent context setup. Use when starting a new session, when agent output quality degrades, when switching between tasks, or when you need to configure rules files and context for a project.

🔥 TrendingActive Claude CodeCodexCursor+1
98k GitHub stars MIT Updated Sep 20, 2026 Free

Breaks work into ordered tasks. Use when you have a spec or clear requirements and need to break work into implementable tasks. Use when a task feels too large to start, when you need to estimate scope, or when parallel work is possible.

↑ GrowingActive Claude CodeCodexCursor+1
98k GitHub stars MIT Updated Sep 20, 2026 Free

Prepares production launches. Use when preparing to deploy to production, or when asking what needs to be in place before shipping. Use when you need a pre-launch checklist, when setting up monitoring, when planning a staged rollout, or when you need a rollback strategy.

↑ GrowingActive Claude CodeCodexCursor+1
98k GitHub stars MIT Updated Sep 20, 2026 Free

Discovers and invokes agent skills. Use when starting a session, or when you need to decide which skill or workflow applies to the piece of work at hand. This is the meta-skill that governs how all other skills are discovered and invoked.

↑ GrowingActive Claude CodeCodexCursor+1
98k GitHub stars MIT Updated Sep 20, 2026 Free

Applies Anthropic's official brand colors and typography to any sort of artifact that may benefit from having Anthropic's look-and-feel. Use it when brand colors or style guidelines, visual formatting, or company design standards apply.

Official↑ GrowingActive Claude CodeCodexCursor+2
75k GitHub stars Complete terms in LICENSE.txt Updated Sep 18, 2026 Free