git-flow

A set of guidelines for working with Git, a tool for tracking code changes. It covers branches, separate workspaces, commits, merging, pull requests, and version tags.

In plain words
What is it for?
Use it when creating branches or worktrees, committing changes, preparing a merge or pull request, or deciding how to mark a release version.
Why use it?
It reduces mistakes when several changes are developed in parallel and helps keep the project history organised.

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/chipfighter/coding-discipline/git-flow
Any agent
npx skills add chipfighter/coding-discipline --skill git-flow
Clone the repo
git clone --depth 1 https://github.com/chipfighter/coding-discipline

Made for: Claude Code, Codex.

Per session 43 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 882 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.00043 $0.00882
Opus 5 $0.00022 $0.00441
Sonnet 5 $0.00009 $0.00176
Haiku 4.5 $0.00004 $0.00088

Measured yesterday against content hash 9c0af84307c7, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

git-flow 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 yesterday.

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/coding-discipline/skills/git-flow/SKILL.md · 32 lines

How it starts

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

Branch naming rules, protected branches, whether to merge directly or through a PR / MR, whether merging triggers CI, and how to choose versions / who creates tags are project-specific rules governed by this repository's AGENTS.md / CLAUDE.md. This skill provides only general discipline.

Version / tag closeout (only for projects that manage versions with tags + CHANGELOG; a tag is a version bookmark—whether it also means release / deployment is defined by the project guide document)

  • Choose the version before creating the branch: first confirm the intended tag with the owner—state the previous tag, what remains in the backlog, and whether this work is a feature or a fix, then recommend a version. Wait for the owner's confirmation before creating the branch; do not finish the work only to discover there is no agreed release target.
  • Follow SemVer: major = breaking change, minor = backward-compatible feature, patch = backward-compatible fix. For 0.x, use the looser convention (minor = capability, patch = fix), and when uncertain prefer the larger bump. The project guide document defines what counts as a minor change.
  • Freeze once decided: after the target version is confirmed, freeze its scope. New requirements arising midway go to the backlog / next version by default. Including one in the current version requires explicit owner approval and a clear statement of what it displaces or defers.
  • Use a component, not a version number, as the commit scope (feat(auth):, not feat(v1.2):). Branches are deleted; commit history is not. The history remains accurate if the version changes.
  • Version closeout sequence: complete the scope → merge the branch into the baseline → get CI green → move the CHANGELOG entry from pending into the new version → create the tag (who creates it and how are project-specific).

Branches and commits

  • Create a new branch for each development effort. Never edit directly on a protected main branch or someone else's branch. If the user or client has explicitly provided a working branch, keep using it instead of creating a pointless one. Keep branches short-lived: integrate them quickly rather than letting them drift.
  • Use a type + short description in branch names (for example, feat/search-pagination or fix/login-timeout); follow the project's naming convention when it has one.
  • Use conventional commits: type(scope): description (feat/fix/refactor/docs/chore…). Commit in small steps, each independently reversible.

Read the full file on GitHub · 32 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. yesterday First seen · 32 lines · 43 tokens per session scan A 9c0af84307c7

Subscribe to this mod's changes

git-flow is a skill published in the GitHub repository chipfighter/coding-discipline (6 stars, last pushed 1mo ago), licensed MIT. It adds 43 tokens to every session and 882 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-31.

Related

Other skills, from other repositories

rulesync

Generates and syncs AI rule configuration files (.cursorrules, CLAUDE.md, copilot-instructions.md) across 20+ coding tools from a single source. Use when syncing AI rules, running rulesync commands, importing or generating rule files, or managing shared AI coding configurations.

dyoshikawa/rulesync · 64 tokens

establishing-project-context

Use when the user asks to establish shared project language, or project work exposes a conflicting, renamed, or deprecated domain term that needs active semantic modeling. Routine small tasks stay on the fast path.

GanyuanRan/Aegis · 45 tokens

autoprompt

Explicit-only useful-first orchestration. Invoke /autoprompt to turn a mission into one executable roadmap, build dependency-safe lanes, and verify the result with independent reviewers. Never infer invocation from ordinary requests. Never resume from leftover artifacts without an explicit resume instruction.

Spielewoy/autoprompt-skill · 56 tokens

office-hours

YC Office Hours — two modes. Startup mode: six forcing questions that expose demand reality, status quo, desperate specificity, narrowest wedge, observation, and future-fit. Builder mode: design thinking brainstorming for side projects, hackathons, learning, and open source. Saves a design doc. Use when asked to…

GCWing/BitFun · 168 tokens

memstack-business-gdpr

Use this skill when the user says 'GDPR', 'data protection', 'privacy compliance', 'DPA', 'DSAR', 'data subject request', 'cookie consent', 'privacy audit', 'CCPA', or asks 'do I need GDPR for this repo'. Scans the repository to detect what personal data is collected, classifies sensitivity, determines whether GDPR…

cwinvestments/memstack · 121 tokens

echo

Use when the user references past sessions, asks 'what did we do', 'do you remember', 'last session', 'recall', or 'continue from'.

cwinvestments/memstack · 35 tokens