git-workflow-and-versioning

github:addyosmani/agent-skills · first seen 2026-10-30 · installs 62.9K · source · badge

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,

Works with

incremental-implementation
Shares slice, atomic, commit, versioning0.17

code-review
Shares parallel, commit, git, merge0.13

yeet
Shares git, commit, pull, branch0.13

planning-and-task-breakdown
Shares parallel, slice, breaks, work0.13

using-agent-skills
Shares development, branching, versioning, committing0.12

Used with

incremental-implementation
Shares slice, atomic, commit, versioning0.17

Skill Health 100 (freshness and quality) estimated by backskills

Listed, not yet scored. This skill has no public model test yet. It is in the scoring queue; submitted skills go first, then the most-installed.

Freshness 100 · Quality 100 · Efficacy not yet tested

Version history

2026-10-31T09:00:38+00:00 · sha256 d77c955f57cf

2026-10-30T20:36:17 · sha256 b7465d187935

Diff at 2026-10-31T09:00:38+00:00

--- previous
+++ current
@@ -1,6 +1,6 @@
 ---
 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), 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.
+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), 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. Use when asked to write a commit message or a changelog entry for a change, or to split a change into commits, even when the diff is pasted inline and the message seems easy to write from it.
 ---
 
 # Git Workflow and Versioning
@@ -216,8 +216,8 @@
 # 1. Check what you're about to commit
 git diff --staged
 
-# 2. Ensure no secrets
-git diff --staged | grep -i "password\|secret\|api_key\|token"
+# 2. Ensure no secrets (lists matching file names only — any output means review them)
+git diff --staged -i -G'password|secret|api_key|token' --name-only
 
 # 3. Run tests
 npm test