git-operations

Guidance for using Git, the version-control system used to track code changes. It covers feature branches, commits, rebasing, pushing, and resolving merge conflicts.

In plain words
What is it for?
Creating feature, bug-fix, and hotfix branches; writing conventional commits; updating branches from main; pushing work; and handling conflicts.
Why use it?
It helps keep changes organized and makes collaboration safer by using consistent branch names, commit messages, and update practices.

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/martinkuhne/devstack/git-operations
Any agent
npx skills add MartinKuhne/devstack --skill git-operations
Clone the repo
git clone --depth 1 https://github.com/MartinKuhne/devstack

Made for: Claude Code, Codex.

Per session 18 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 473 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.00018 $0.00473
Opus 5 $0.00009 $0.00236
Sonnet 5 $0.00004 $0.00095
Haiku 4.5 $0.00002 $0.00047

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

Security

Grade A, and why

git-operations 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.

.opencode/skills/git-operations/SKILL.md · 107 lines

What it actually says

What I do

I provide guidance and best practices for Git operations, focusing on:

  • Creating and managing feature branches
  • Making commits with meaningful messages
  • Branch naming conventions
  • Handling merge conflicts
  • Keeping branches up-to-date with main

Branch Naming Convention

Use this format for feature branches:

feature/<ticket-id>-<short-description>
feature/ai-123-add-user-auth
bugfix/456-fix-login-error
hotfix/789-security-patch

Commit Message Format

Follow conventional commits:

<type>(<scope>): <subject>

<body>

<footer>

Types: feat, fix, docs, style, refactor, test, chore

Example:

feat(auth): add OAuth2 authentication support

- Implement Google OAuth2 flow
- Add token refresh logic
- Update user model with provider field

Closes #123

Working with Feature Branches

Create and Switch

git checkout -b feature/123-add-auth

Update from Main

git fetch origin
git rebase origin/main

Commit Changes

git add <files>
git commit -m "feat(scope): description"

Push Branch

git push -u origin feature/123-add-auth

Merge Conflict Resolution

  1. Identify conflicting files:
git status
  1. Open conflicting files and resolve marked sections:
your changes
=======
incoming changes
>>>>>>> branch-name
  1. After resolving, stage and commit:
git add <resolved-files>
git commit

Best Practices

  • Commit early and often with clear messages
  • Keep commits atomic (one logical change per commit)
  • Rebase over merge when updating from main
  • Use --force-with-lease when force pushing (never --force)
  • Delete merged branches after PR approval
  • Always pull latest main before creating new feature branches
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 · 107 lines · 18 tokens per session scan A 00b01808e3d8

Subscribe to this mod's changes

git-operations is a skill published in the GitHub repository MartinKuhne/devstack (2 stars, last pushed 20d ago), licensed MIT. It adds 18 tokens to every session and 473 once invoked, about $0.0001 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

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

next-cache-components-adoption

Turn on Cache Components in a Next.js app and resolve the blocking routes it surfaces. Use when the user wants to enable, adopt, or migrate to Cache Components, flip the cacheComponents flag, work through a flood of blocking-prerender / instant validation errors, run the cache-components-instant-false codemod, or…

vercel/next.js · 95 tokens

babysit-pr

Babysit a GitHub pull request after creation by continuously polling review comments, CI checks/workflow runs, and mergeability state until the PR is merged/closed or user help is required. Diagnose failures, retry likely flaky failures up to 3 times, auto-fix/push branch-related issues when appropriate, and keep…

openai/codex · 114 tokens

imagegen

Generate or edit raster images when the task benefits from AI-created bitmap visuals such as photos, illustrations, textures, sprites, mockups, or transparent-background cutouts. Use when Codex should create a brand-new image, transform an existing image, or derive visual variants from references, and the output…

openai/codex · 113 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens

next-cache-components-optimizer

Drive a Next.js route to instant navigation by setting up an agentic loop, under Cache Components / PPR, on initial load (hard navigation) and client-side navigation (soft navigation). Encode the goal as a failing @next/playwright instant() e2e and work it to green, one verified route at a time; the shipped test then…

vercel/next.js · 170 tokens