git-workflow

A set of rules for making Git commits and managing Git history consistently.

In plain words
What is it for?
It guides commit messages, conflict handling, and rewording existing commits, including a required format with a present-tense verb, one line, and a final period.
Why use it?
It prevents unclear multi-line commit messages and helps avoid accidentally including unrelated files or using the wrong workflow for history changes.

Skill for Claude CodeCodex

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.

agentmods
npx agentmods add skills/motlin/claude-code-plugins/git-workflow
Any agent
npx skills add motlin/claude-code-plugins --skill git-workflow
Clone the repo
git clone --depth 1 https://github.com/motlin/claude-code-plugins

Made for: Claude Code, Codex.

Per session 34 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 472 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
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 $0.00034 $0.00472
Opus 5 $0.00017 $0.00236
Sonnet 5 $0.00007 $0.00094
Haiku 4.5 $0.00003 $0.00047

Measured 2d ago against content hash 144ef2b2c2df, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, 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 2d 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.

plugins/git/skills/git-workflow/SKILL.md · 44 lines

What it actually says

Git Workflow Best Practices

This skill provides guidelines for git operations including commits, conflict resolution, and branch management.

Commit Guidelines

Use the git-commit skill for commit operations. In Claude Code this may delegate to the git:commit-handler agent; in Codex, follow the git-commit skill directly unless the user explicitly asks for a subagent workflow.

Commit Message Format

Every commit message is a single line — no body, no bullet list, no blank-line-separated paragraphs. It must:

  • Start with a present-tense verb (Add, Fix, Replace, Remove, Update, …)
  • Be 60-120 characters
  • End with a period
  • Avoid praise adjectives (comprehensive, robust, essential, best practices)

A task description or prompt is intent, not the message. When the prompt is long or multi-line, distill it to one line — never copy it verbatim into the commit message. This rule applies to writing new commits and to rewording existing ones with git history reword.

Conflict Resolution

Use the git-conflicts skill to resolve git merge or rebase conflicts. In Codex, spawn a subagent only when the user explicitly asks for subagents or parallel agent work.

Rebasing

Use the git-rebase skill to rebase the current branch on upstream.

Prefer Modern Git Commands

Use newer git commands instead of their legacy equivalents whenever possible:

  • git switch instead of git checkout for switching branches
  • git switch -c instead of git checkout -b for creating branches
  • git restore instead of git checkout -- for restoring files
  • git restore --staged instead of git reset HEAD for unstaging files
  • git replay --onto instead of git rebase --onto for non-interactive onto rebases
  • git history reword instead of interactive rebase or amending for editing commit messages
  • git history split instead of interactive rebase for splitting commits
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. 2d ago First seen · 44 lines · 34 tokens per session scan A 144ef2b2c2df

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository motlin/claude-code-plugins (15 stars, last pushed 3d ago), licensed Apache-2.0. It adds 34 tokens to every session and 472 once invoked, about $0.0002 per session on Opus 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-30.

Related

Other skills, from other repositories

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

next-cache-components-adoption

Turn on Cache Components in a Next.js app and resolve the blocking routes it surfaces. Use when the user wants to enable, adopt, or migrate to Cache Components, flip the cacheComponents flag, work through a flood of blocking-prerender / instant validation errors, run the cache-components-instant-false codemod, or…

vercel/next.js · 95 tokens

babysit-pr

Babysit a GitHub pull request after creation by continuously polling review comments, CI checks/workflow runs, and mergeability state until the PR is merged/closed or user help is required. Diagnose failures, retry likely flaky failures up to 3 times, auto-fix/push branch-related issues when appropriate, and keep…

openai/codex · 114 tokens

imagegen

Generate or edit raster images when the task benefits from AI-created bitmap visuals such as photos, illustrations, textures, sprites, mockups, or transparent-background cutouts. Use when Codex should create a brand-new image, transform an existing image, or derive visual variants from references, and the output…

openai/codex · 113 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens

next-cache-components-optimizer

Drive a Next.js route to instant navigation by setting up an agentic loop, under Cache Components / PPR, on initial load (hard navigation) and client-side navigation (soft navigation). Encode the goal as a failing @next/playwright instant() e2e and work it to green, one verified route at a time; the shipped test then…

vercel/next.js · 170 tokens