git-workflow

git-workflow is a skill for Claude Code from boparaiamrit/skills-by-amrit. It costs 36 tokens per session (1,611 once invoked), scanned A, original, MIT.

A set of rules for managing Git branches, commits, merges, rebases, and conflicts. Git is the system that records changes to a codebase over time.

In plain words
What is it for?
It is for starting branches, creating clean commits, merging features, resolving conflicts, and managing parallel work.
Why use it?
It helps keep changes organized, reversible, and easier to understand when debugging or working with others.

Skill for Claude Code

Written for Claude Code: shipped in a Claude Code plugin.

Part of the skills-by-amrit plugin — 33 skills, 34 commands, 9 agents shipped together

Good fit It is for starting branches, creating clean commits, merging features, resolving conflicts, and managing parallel work.

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

Made for: Claude Code.

Or install skills-by-amrit, the plugin that ships this one along with the rest of its 33 skills, 34 commands, 9 agents.

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/boparaiamrit/skills-by-amrit/git-workflow/github.svg)](https://agentmods.dev/skills/boparaiamrit/skills-by-amrit/git-workflow)
Your own site
<a href="https://agentmods.dev/skills/boparaiamrit/skills-by-amrit/git-workflow"><img src="https://agentmods.dev/badge/skills/boparaiamrit/skills-by-amrit/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/boparaiamrit/skills-by-amrit/git-workflow"><img src="https://agentmods.dev/badge/skills/boparaiamrit/skills-by-amrit/git-workflow.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 36 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,611 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.00036 $0.01611
Opus 5 $0.00018 $0.00805
Sonnet 5 $0.00007 $0.00322
Haiku 4.5 $0.00004 $0.00161

Measured 8d ago against content hash 2dc5f2da1e07, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-11, 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 8d 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 · 221 lines

How it starts

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

Git Workflow

Overview

Git is the record of your project's evolution. Every commit should be atomic, meaningful, and reversible.

Core principle: Clean history enables clean debugging. Every commit tells a story.

The Iron Law

NO COMMIT WITHOUT PASSING TESTS. NO MERGE WITHOUT REVIEW.

When to Use

  • Starting any new work (branch creation)
  • Every completed task (commit)
  • Finishing a feature (merge/PR)
  • Dealing with conflicts
  • Managing multiple parallel efforts

When NOT to Use

  • Deciding what to build (use brainstorming)
  • Deciding how to build it (use writing-plans)
  • This is a reference skill for git operations, not a decision-making skill

Anti-Shortcut Rules

YOU CANNOT:
- Commit directly to main — always use feature branches
- Use git add . without reviewing staged files — stage interactively (git add -p)
- Force push to shared branches — only force push YOUR branches
- Commit with "WIP", "fix", or "update" messages — describe WHAT and WHY
- Commit debug code, console.logs, or TODO comments — clean up first
- Squash without reading the individual commits — understand what you're merging
- Skip tests before committing — failing tests = broken commit
- Resolve conflicts by picking one side without understanding both — merge INTENT

Common Rationalizations (Don't Accept These)

Rationalization Reality
"I'll clean up the history later" You won't. Write clean commits now.
"It's just a small commit to main" Small direct commits cause most merge conflicts and regressions.
"WIP commit, I'll squash later" WIP commits become permanent. Write a real message.
"Force push is fine, nobody else uses this branch" Until someone does. Only force push branches YOU own.
"I'll review what I staged before pushing" Review before staging. After is too late — you'll miss things.
"The tests passed earlier" Earlier ≠ now. Run them before every commit.

Iron Questions

Read the full file on GitHub · 221 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. 8d ago First seen · 221 lines · 36 tokens per session scan A 2dc5f2da1e07

Subscribe to this mod's changes

git-workflow is a skill published in the GitHub repository boparaiamrit/skills-by-amrit (5 stars, last pushed 5mo ago), licensed MIT. It adds 36 tokens to every session and 1,611 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-09-03.