Skip to content
Kitbay
Skill

git-workflow-and-versioning

MITUpdated on Nov 1, 2026115,373GitHub stars

A skill from Addy Osmani's agent-skills collection that sets out git habits for any code change.

What the skill teaches

A skill from Addy Osmani's agent-skills collection that sets out git habits for any code change. It favours trunk-based development with feature branches merged within days and feature flags instead of long-lived branches, small single-purpose commits of roughly a hundred lines with messages that explain why and use prefixes such as feat, fix and refactor, and keeping refactors apart from behaviour changes. It also covers git worktrees for agents working in parallel, save points to roll back a failed step, structured change summaries, and for releases semantic versioning, tags and changelogs written for users. It links to related skills on code review, API design, deprecation and shipping.

Capabilities

  • Keep commits small with clear messages
  • Use git worktrees for parallel agent work
  • Set save points to roll back failed steps
  • Tag releases with semantic versions and changelogs