agentmods.dev

git-workflow

git-workflow is a skill for Claude Code from timwukp/agent-skills-best-practice. It costs 49 tokens per session (1,168 once invoked), scanned A, original, MIT.

A guide to common Git workflows, including commit messages, branch planning, merge-conflict resolution, and changelog creation. Git is a system for tracking changes to source code.

In plain words
What is it for?
Use it to write Conventional Commit messages, choose a branching strategy, resolve conflicts, or create release notes from Git history.
Why use it?
It helps keep collaboration and project history consistent, especially when several developers work on the same codebase.

Skill for Claude Code

Written for Claude Code: shipped in a Claude Code plugin.

Part of the engineering-skills plugin — 18 skills shipped together

not rated 12repo 1mo ago A scan SkillSpector: pass 49 tokens original MIT

Good fit Use it to write Conventional Commit messages, choose a branching strategy, resolve conflicts, or create release notes from Git history.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/timwukp/agent-skills-best-practice/git-workflow
View source ↗ timwukp/agent-skills-best-practice
Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Any agent
npx skills add timwukp/agent-skills-best-practice --skill git-workflow
Clone the repo
git clone --depth 1 https://github.com/timwukp/agent-skills-best-practice

Made for: Claude Code.

Or install engineering-skills, the plugin that ships this one along with the rest of its 18 skills.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for git-workflow

README.md
[![agentmods](https://agentmods.dev/badge/skills/timwukp/agent-skills-best-practice/git-workflow/github.svg)](https://agentmods.dev/skills/timwukp/agent-skills-best-practice/git-workflow)
Your own site
<a href="https://agentmods.dev/skills/timwukp/agent-skills-best-practice/git-workflow"><img src="https://agentmods.dev/badge/skills/timwukp/agent-skills-best-practice/git-workflow/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for git-workflow

Your own site · 80×15
<a href="https://agentmods.dev/skills/timwukp/agent-skills-best-practice/git-workflow"><img src="https://agentmods.dev/badge/skills/timwukp/agent-skills-best-practice/git-workflow.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 49 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,168 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe. Third-party audits
  • NVIDIA SkillSpector pass 7 Sept 2026
How audits are shown
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00049 $0.01168
Opus 5.5 $0.00020 $0.00467
Sonnet 5.5 $0.00010 $0.00234
Haiku 4.5 $0.00005 $0.00117

Measured 1mo ago against content hash c7751180b2d4, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

git-workflow scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 1mo ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

skills/skills/git-workflow/SKILL.md · 176 lines

How it starts

The opening of the file, as written. The whole thing — 176 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Git Workflow

Instructions

Step 1: Identify the Task

Determine which workflow the user needs:

  1. Commit message - writing or improving a commit message
  2. Branching strategy - choosing or implementing a branching model
  3. Conflict resolution - resolving merge conflicts
  4. Changelog - generating release notes from commit history

Ask clarifying questions only if the intent is ambiguous.

Step 2: Conventional Commits

When writing commit messages, follow the Conventional Commits specification:

<type>[optional scope]: <description>

[optional body]

[optional footer(s)]

Types (in order of frequency):

  • feat - new feature (correlates with MINOR in semver)
  • fix - bug fix (correlates with PATCH in semver)
  • docs - documentation only
  • style - formatting, no code change
  • refactor - neither fix nor feature
  • perf - performance improvement
  • test - adding or fixing tests
  • chore - build process, tooling, dependencies
  • ci - CI/CD configuration changes

Rules:

  • Description is lowercase, no period at end, max 72 characters
  • Body wraps at 72 characters, explains what and why (not how)
  • Breaking changes: add ! after type or BREAKING CHANGE: in footer

Examples:

feat(auth): add OAuth2 login with Google provider

Implements the OAuth2 authorization code flow for Google.
Stores tokens in encrypted session storage.

Closes #142

fix(api): prevent race condition in concurrent order creation

Added optimistic locking with version column check.
Returns 409 Conflict when version mismatch detected.

Step 3: Branching Strategies

Recommend based on team size and release cadence:

Trunk-Based Development (recommended for most teams):

  • Single main branch, always deployable
  • Short-lived feature branches (max 2 days)
  • Feature flags for incomplete work
  • Best for: CI/CD, small teams, frequent releases

GitHub Flow:

  • main branch + feature branches
  • PR-based review before merge
  • Deploy from main after merge
  • Best for: open source, SaaS with continuous deployment

Read the full file on GitHub · 176 lines

Files

What ships with it

2 files beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 1mo ago First seen · 176 lines · 49 tokens per session scan A c7751180b2d4

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository timwukp/agent-skills-best-practice (12 stars, last pushed 1mo ago), licensed MIT. It adds 49 tokens to every session and 1,168 once invoked, about $0.0002 per session on Opus 5.5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Claude CodeCommitsGit and workflowReleasesagent-skillsai-agentsawsbest-practicesclaude-skills
Related

Other skills, from other repositories

git-workflow

Guided git workflows: prepare PRs, clean up branches, resolve merge conflicts, handle monorepo tags, squash-and-merge patterns. Use when asked to prepare a PR, clean branches, resolve conflicts, or tag a release.

jezweb/claude-skills · 52 tokens

git-workflow

A Git workflow guide for organizing commits, branches, pull requests, releases, and automated version-control tasks. Git is the system developers use to track code changes and collaborate.

huangwb8/skills · 47 tokens

changelog

Use when writing a changelog or release notes. Covers what belongs in one, writing for users rather than for git, semantic versioning, and documenting breaking changes so nobody is surprised. Trigger on "write release notes for v2.3", "update the changelog", "is this a major or minor version bump". Do not use for…

nimadorostkar/Claude-Skills-collection · 95 tokens

git-workflow

Use for branching, committing, history repair, and release hygiene. Covers atomic commits, rebase versus merge, bisect, reflog recovery, and undoing mistakes safely. Trigger on "undo my last commit", "i messed up a rebase", "squash these commits", "find which commit broke this". Do not use for pipeline and deploy…

nimadorostkar/Claude-Skills-collection · 85 tokens

git

Granular git operations with conventional commits - stage, commit, push, PR, merge. Auto-splits commits by type/scope, blocks on secrets, delegates verbose work to git-manager subagent. GitHub CLI conventions: --body-file for PR bodies, treat gh pr checks exit 8 (pending) as retry not failure, guard run-id assignment…

vanducng/skills · 95 tokens

github-cli

Skill "github-cli" from juan294/cc-rpi, covering github cli, json field discovery, pr check interpretation, or watch existing checks to completion and release vs pr flags.

juan294/cc-rpi · 28 tokens