git-workflow

A set of practices for organizing Git branches, commits, merges, and urgent fixes. A branch is a separate line of code changes, and a commit is a saved logical change in the repository.

In plain words
What is it for?
Use it to name branches, write commit messages, rebase and merge changes, run checks before merging, and handle hotfixes across the main development branches.
Why use it?
It helps keep changes reviewable, histories understandable, and merges safer. It also gives a consistent approach to preparing feature work and production fixes.

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/npc-worldwide/npcsh/git-workflow
Any agent
npx skills add NPC-Worldwide/npcsh --skill git-workflow
Clone the repo
git clone --depth 1 https://github.com/NPC-Worldwide/npcsh

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 375 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.00375
Opus 5 $0.00017 $0.00187
Sonnet 5 $0.00007 $0.00075
Haiku 4.5 $0.00003 $0.00038

Measured 3d ago against content hash 33643ad9f984, 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 3d 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 · 53 lines

What it actually says

git-workflow

Git workflow best practices. Use when asked about git branching, commits, or merge strategy. [Sections: branching, commits, merging, hotfix]

Branching

Use feature branches off main/develop: git checkout -b feature/my-feature develop Name branches descriptively: feature/ — new functionality fix/ — bug fixes chore/ — maintenance, deps, config Keep branches short-lived. Rebase onto target before merging.

Commits

Write clear commit messages: Line 1: imperative summary under 72 chars Line 3+: explain WHY, not what (the diff shows what) One logical change per commit. Don't mix refactors with features. Use conventional commits if the project uses them: feat: add user search fix: handle null avatar URL chore: bump eslint to v9

Merging

Prefer squash merges for feature branches (clean history). Use merge commits for long-lived branches (preserves context). Always pull/rebase before merging to avoid unnecessary merge commits. Delete branches after merging. Run CI before merging — never merge a red build.

Hotfix

For urgent production fixes:

  1. Branch off main: git checkout -b hotfix/fix-name main
  2. Make the minimal fix
  3. Test thoroughly
  4. Merge to main AND develop/release
  5. Tag the release Keep hotfix scope minimal — fix only the immediate issue.
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. 3d ago First seen · 53 lines · 0 tokens per session scan A 33643ad9f984

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository NPC-Worldwide/npcsh (471 stars, last pushed 6d ago), licensed MIT. It adds 34 tokens to every session and 375 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

prowler-commit

Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.

prowler-cloud/prowler · 33 tokens

git-commit

Generate well-formatted git commit messages following conventional commit standards.

ThinkInAIXYZ/deepchat · 15 tokens

git-workflow

This skill should be used when the user asks to "create git commit", "manage branches", "follow git workflow", "use Conventional Commits", "handle merge conflicts", or asks about git branching strategies, version control best practices, pull request workflows. Provides comprehensive Git workflow guidance for team…

Galaxy-Dawn/claude-scholar · 64 tokens

commits

Use this skill whenever the user asks to commit changes, write or fix a commit message, amend or rename a commit, or do a workflow that includes committing in the IntelliJ repository. This is a thin repo-specific overlay: use IntelliJ commit format, write full commit messages by default, and keep requested suffixes…

JetBrains/MPS · 78 tokens

contributing

How to contribute to evlog, covering commit and PR conventions, changesets, the Definition of Done, testing rules, and the authored skills that walk through building a new adapter, enricher, framework integration, or map rule. Load this for any question about contributing, opening a PR, or adding something to the…

HugoRCD/evlog · 68 tokens

commit

Commit current changes with a clear, descriptive message.

NVIDIA-NeMo/DataDesigner · 11 tokens