git-master

A set of rules for carrying out Git operations while keeping each commit focused on one complete change. Git is the version-control system used to track code history.

In plain words
What is it for?
Use it when creating commits, rebasing, cherry-picking, cleaning up history, preparing branches for review, or resolving merge conflicts.
Why use it?
It prevents mixed or incomplete commits that make reviews, debugging, reverting, and moving changes between branches harder.

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/jeremydev87/codingbuddy/git-master
Any agent
npx skills add JeremyDev87/codingbuddy --skill git-master
Clone the repo
git clone --depth 1 https://github.com/JeremyDev87/codingbuddy

Made for: Claude Code, Codex.

Per session 39 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 2,869 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.00039 $0.02869
Opus 5 $0.00019 $0.01435
Sonnet 5 $0.00008 $0.00574
Haiku 4.5 $0.00004 $0.00287

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

Security

Grade A, and why

git-master 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 2d 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.

packages/rules/.ai-rules/skills/git-master/SKILL.md · 359 lines

How it starts

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

Git Master

Overview

Messy git history obscures intent, makes debugging harder, and wastes reviewer time. Clean history tells the story of WHY changes were made, not just WHAT changed.

Core principle: Every commit should be a single, complete, logical change that can be understood, reverted, or cherry-picked independently.

Violating the letter of this process is violating the spirit of clean version control.

The Iron Law

ONE LOGICAL CHANGE PER COMMIT. NO EXCEPTIONS.

If a commit does two things, it should be two commits. If a commit is incomplete, it should not exist yet.

No exceptions:

  • "I'll split it later" → Split it now
  • "It's a small extra change" → Separate commit
  • "They're related" → Related is not identical

When to Use

Use for ANY git operation beyond trivial:

  • Creating commits (single or multiple)
  • Rebasing branches (interactive or standard)
  • Cherry-picking commits across branches
  • Cleaning up history (amend, squash, fixup)
  • Resolving merge conflicts
  • Preparing branches for review

Use this ESPECIALLY when:

  • Repository has established commit conventions
  • Branch has messy work-in-progress commits before PR
  • Cherry-picking between release branches
  • Resolving complex merge conflicts
  • History needs cleanup before merging

Don't skip when:

  • "It's just a quick fix" (quick fixes deserve clean commits too)
  • "Nobody reads commit history" (future-you does, during git bisect)
  • "I'll squash on merge anyway" (squash merges lose valuable context)

When NOT to Use

  • Initial prototyping — Experiment freely, clean up before PR
  • Throwaway branches — No need for perfect history on disposable work
  • Automated commits — CI/CD generated commits follow their own patterns

The Six Phases

Phase 1: Style Detection

BEFORE making any commit, understand the repo's conventions:

  1. Analyze Recent History

    git log --oneline -20
    
  2. Detect Commit Message Pattern

    Pattern Example Convention
    Conventional Commits feat(auth): add OAuth2 flow type(scope): description
    Imperative mood Add user validation Verb-first, present tense
    Ticket prefix [PROJ-123] Fix login bug [TICKET] description
    Emoji prefix :bug: Fix null pointer Emoji + description
    Freeform Fixed the login thing No consistent pattern

Read the full file on GitHub · 359 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. 2d ago First seen · 359 lines · 39 tokens per session scan A 27ba9c901439

Subscribe to this mod's changes

git-master is a skill published in the GitHub repository JeremyDev87/codingbuddy (31 stars, last pushed 4mo ago), licensed MIT. It adds 39 tokens to every session and 2,869 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

om-integration-builder

Build integration provider packages for the Open Mercato Integration Marketplace (payment, shipping, data-sync, webhook). Scaffolds the npm package, adapter, credentials, widget injection, webhook processing, health checks, i18n, tests. Triggers on "build integration", "add provider", "integrate with…

open-mercato/open-mercato · 73 tokens

om-ds-guardian

Design System Guardian for Open Mercato. Use for frontend UI work, design-system compliance reviews, semantic token migration, hardcoded color or typography cleanup, DS-compliant page scaffolding, and common DS violations such as arbitrary text sizes, raw color classes, or missing shared states. Prefer this skill…

open-mercato/open-mercato · 76 tokens

om-integration-tests

Run and create QA integration tests (Playwright TypeScript), including executing the full suite, converting optional markdown scenarios, and generating new tests from specs or feature descriptions. Defers all environment boot/reuse to the om-prepare-test-env skill and attaches to the shared descriptor it writes. Use…

open-mercato/open-mercato · 99 tokens

om-create-agents-md

Create or rewrite AGENTS.md files for Open Mercato packages and modules. Use this skill when adding a new package, creating a new module, or when an existing AGENTS.md needs to be created or refactored. Ensures prescriptive tone, the Always/Ask First/Never/Validation Commands boundary structure, MUST-style rules…

open-mercato/open-mercato · 85 tokens

om-smart-test

Run only the tests affected by changed code. Use when the user says "run affected tests", "run smart tests", "test only what changed", "run tests for this PR", "run tests for my changes", "selective tests", or asks to run tests without running the full suite.

open-mercato/open-mercato · 64 tokens

om-auto-qa-scenarios

Generate a human QA report for a window of merged PRs (date floor, PR-number floor, or default last 7 days) and ship it as a docs-only PR against develop. Groups work into P0/P1/P2 testing routes with click paths, verification points, and risk callouts. Writes markdown + HTML under .ai/analysis/. Hands off to…

open-mercato/open-mercato · 99 tokens