git-workflow

git-workflow is a skill for Claude Code, Codex from FutureJJ/claude-skills. It costs 47 tokens per session (286 once invoked), scanned A, original, MIT.

A Git guide covering branches, interactive rebase, bisect, hooks, merge conflicts, and monorepos, which are repositories containing multiple related projects.

In plain words
What is it for?
Use it for branching decisions, conflict resolution, rebase strategies, debugging with bisect, hooks, or Git workflows across a monorepo.
Why use it?
It helps keep shared history understandable and gives teams clear ways to integrate changes and resolve problems.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one.

Good fit Use it for branching decisions, conflict resolution, rebase strategies, debugging with bisect, hooks, or Git workflows across a monorepo.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/futurejj/claude-skills/git-workflow
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 FutureJJ/claude-skills --skill git-workflow
Clone the repo
git clone --depth 1 https://github.com/FutureJJ/claude-skills

Made for: Claude Code, Codex.

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/futurejj/claude-skills/git-workflow/github.svg)](https://agentmods.dev/skills/futurejj/claude-skills/git-workflow)
Your own site
<a href="https://agentmods.dev/skills/futurejj/claude-skills/git-workflow"><img src="https://agentmods.dev/badge/skills/futurejj/claude-skills/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/futurejj/claude-skills/git-workflow"><img src="https://agentmods.dev/badge/skills/futurejj/claude-skills/git-workflow.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 47 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 286 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.
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.00047 $0.00286
Opus 5.5 $0.00019 $0.00114
Sonnet 5.5 $0.00009 $0.00057
Haiku 4.5 $0.00005 $0.00029

Measured 1mo ago against content hash aca6a4af2755, 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/git-workflow/SKILL.md · 28 lines

What it actually says

Git Workflow

You are a Git expert focused on clean history and productive team workflows.

Core Principles

  • Atomic commits. Each commit does one thing and the message explains why.
  • Rebase for local, merge for shared. Rebase your feature branch onto main. Merge when integrating.
  • Never force push shared branches. Only force push your own feature branches.
  • Conventional commits. feat:, fix:, refactor:, docs:, chore: prefixes enable automated changelogs.

Anti-Patterns

  • Merge commits for every sync — use rebase to keep history linear
  • Giant commits with "WIP" messages — commit small and often, squash before merge
  • Committing secrets — use .gitignore and git-secrets

Reference Guide

Topic Reference Load When
Branching strategies references/branching.md Trunk-based, GitFlow, workflows
Advanced operations references/advanced.md Rebase, bisect, cherry-pick, hooks
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 · 28 lines · 47 tokens per session scan A aca6a4af2755

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository FutureJJ/claude-skills (3 stars, last pushed 7mo ago), licensed MIT. It adds 47 tokens to every session and 286 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.

Related

Other skills, from other repositories

audit-pr

Audit a whole PR against the delivery contract and return MERGE-READY or evidenced blockers with the full URL. Consumes the current review-change REVIEW-PASS receipt instead of re-running review axes; posts a SHA-bound ready comment; never edits or merges. Triggers: "audit-pr", "is this PR ready", "merge gate".

gtrabanco/agentic-workflow · 71 tokens

execute-phase

Step executor for units whose triage (unit-lane) decided which steps the unit needs. Implements one triaged step (or all remaining steps), with frozen acceptance, step-local gates, commits, red-gate repair, and diff-size guard. BREAKING: replaced PLAN.md/TASKS.md/progress.md/ACCEPTANCE.md with the unit doc's Tasks…

gtrabanco/agentic-workflow · 106 tokens

github-readme

Generate polished GitHub README.md files for Mick's repositories in his established voice and structure. Always trigger immediately when the user's message starts with "readme" or "gr". Also trigger on "write a readme", "generate readme", "readme for this repo", "document this repo", or any request to create or…

mickpletcher/AI-Skills · 98 tokens

github-repo-architect

Convert a repository idea into a complete GitHub repository architecture. Always trigger immediately when the user's message starts with "repo", "gra", or "architect repo". Also trigger on "build a repo structure", "design a GitHub repo", "scaffold this repository", "create repository architecture", "turn this idea…

mickpletcher/AI-Skills · 106 tokens

resolve-repository-state

Resolve an explicit Normalized Repository State contradiction. This is the sole writer allowed to update frozen repository facts or accepted decisions. Triggers: "resolve repository state", "resolve contradiction", "update a frozen repository fact".

gtrabanco/agentic-workflow · 48 tokens

neo-pr

Use this skill when the user asks to create, draft, review, format, or generate a Pull Request (PR) title and description, specify target or source branches for a repository, or convert git branch diffs into concise, high-impact, non-AI-slop PR content.

Benknightdark/neo-skills · 60 tokens