mav-git-workflow

mav-git-workflow is a skill for Claude Code, Codex from thermiteau/maverick. It costs 50 tokens per session (3,748 once invoked), scanned A, original, Apache-2.0.

Git workflow guidance for managing branches, commits, merges, pull requests, and isolated worktrees. A worktree is a separate checkout of the same repository, useful when several tasks are in progress.

In plain words
What is it for?
Use it to choose a branching strategy, name and organize commits, handle merge conflicts, manage worktrees, and coordinate stacked pull requests.
Why use it?
It removes uncertainty about how changes move from a developer's machine into a shared remote repository. It also keeps parallel work separated and makes progress easier to track.

Skill for Claude CodeCodex

Part of the maverick plugin — 41 skills, 5 agents, 5 hooks shipped together

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/thermiteau/maverick/mav-git-workflow
Any agent
npx skills add thermiteau/maverick --skill mav-git-workflow
Clone the repo
git clone --depth 1 https://github.com/thermiteau/maverick

Made for: Claude Code, Codex.

Or install maverick, the plugin that ships this one along with the rest of its 41 skills, 5 agents, 5 hooks.

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 mav-git-workflow

README.md
[![agentmods](https://agentmods.dev/badge/skills/thermiteau/maverick/mav-git-workflow.svg)](https://agentmods.dev/skills/thermiteau/maverick/mav-git-workflow)
Your own site
<a href="https://agentmods.dev/skills/thermiteau/maverick/mav-git-workflow"><img src="https://agentmods.dev/badge/skills/thermiteau/maverick/mav-git-workflow.svg" alt="Measured on agentmods" height="20"></a>
Per session 50 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 3,748 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.00050 $0.03748
Opus 5 $0.00025 $0.01874
Sonnet 5 $0.00010 $0.00750
Haiku 4.5 $0.00005 $0.00375

Measured 5d ago against content hash 29d2d71227db, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

mav-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 5d 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/mav-git-workflow/SKILL.md · 447 lines

How it starts

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

Git Workflow

A trunk-based strategy for all development work. This skill defines how branches, commits, and merges are managed.

Remote Repository Requirement

A configured remote repository is mandatory. Local-only git is a hard fail — all projects must push to a remote hosting service (GitHub, GitLab, Bitbucket, Azure Repos, etc.).

Validation

Before starting any work, verify a remote exists:

git remote -v

If no remote is configured:

  1. Stop work — do not proceed with feature branches, commits, or PRs
  2. Notify the user — report that no remote repository is configured and that this is a hard requirement
  3. Do not create a remote autonomously — the user must set up the remote repository and configure the origin

A project with no remote cannot use protected branches, pull requests, or CI/CD — all of which are foundational to this workflow.

Worktrees — required for multi-story workflows

Maverick's multi-story workflows (do-epic) run each story in its own git worktree under .maverick/worktrees/. This keeps in-flight stories isolated from each other and from the main checkout.

Worktree precondition

Before entering do-epic (or any flow that relies on worktrees), verify the capability:

uv run maverick worktree list

If this fails, the workflow aborts with a hard error. Worktrees require:

  • A non-shallow clone (git rev-parse --is-shallow-repository returns false). Shallow clones cannot create new worktrees.
  • A git version that supports git worktree add (2.15+).
  • Filesystem write access under .maverick/worktrees/.

Worktree lifecycle

One worktree per story, created off the resolved base branch:

uv run maverick worktree create <branch> [--base <base-branch>]

On every exit path — merge, eject, abort — destroy the worktree:

uv run maverick worktree destroy <path>

Leaving stale worktrees inflates disk usage and confuses future worktree list reads. The only reason to keep a worktree after exit is if a PR was ejected and the human may want to inspect the in-flight state — note the path in the eject comment.

Read the full file on GitHub · 447 lines

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. 5d ago First seen · 447 lines · 50 tokens per session scan A 29d2d71227db

Subscribe to this mod's changes

mav-git-workflow is a skill published in the GitHub repository thermiteau/maverick (11 stars, last pushed 1mo ago), licensed Apache-2.0. It adds 50 tokens to every session and 3,748 once invoked, about $0.0003 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.