git-master

A guide to advanced Git version-control work, including branch strategy, commit messages, history changes, and conflict resolution.

In plain words
What is it for?
Use it for rebasing, cherry-picking, bisecting, resolving merge conflicts, managing branches, crafting commits, and cleaning up history.
Why use it?
It helps keep complicated repository changes organized and recoverable when ordinary Git commands are not enough.

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/junghwayang/oh-my-codex/git-master
Any agent
npx skills add junghwaYang/oh-my-codex --skill git-master
Clone the repo
git clone --depth 1 https://github.com/junghwaYang/oh-my-codex

Made for: Claude Code, Codex.

Per session 0 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 640 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.00000 $0.00640
Opus 5 $0.00000 $0.00320
Sonnet 5 $0.00000 $0.00128
Haiku 4.5 $0.00000 $0.00064

Measured 2d ago against content hash f8c8f23911ac, 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.

.codex/skills/git-master/SKILL.md · 116 lines

How it starts

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

Git Master Skill

Expert git workflow management.

When to Use

  • Complex git operations (rebase, cherry-pick, bisect)
  • Branch management strategies
  • Commit message crafting
  • Merge conflict resolution
  • Git history cleanup

When NOT to Use

  • Simple add/commit/push (just do it directly)
  • Basic branch checkout

Capabilities

Commit Crafting

Format: <type>(<scope>): <description>

Types:
- feat: New feature
- fix: Bug fix
- refactor: Code change that neither fixes a bug nor adds a feature
- docs: Documentation only
- test: Adding/updating tests
- chore: Maintenance tasks
- perf: Performance improvement
- style: Code style (formatting, semicolons, etc)

Examples:
feat(auth): add JWT refresh token support
fix(api): handle null user in profile endpoint
refactor(utils): extract date formatting to helper

Branch Strategies

Feature Branch:

git checkout -b feature/description
# work...
git commit -m "feat: ..."
git push -u origin feature/description
# create PR

Hotfix:

git checkout -b hotfix/description main
# fix...
git commit -m "fix: ..."
git checkout main && git merge hotfix/description
git tag -a v1.0.1 -m "Hotfix: description"

Interactive Rebase

# Clean up last N commits
git rebase -i HEAD~N

# Commands:
# pick = keep commit
# reword = change message
# squash = merge into previous
# drop = remove commit

Conflict Resolution

1. Identify conflicting files: git status
2. Open each file, look for <<<<<<< markers
3. Choose correct version or merge manually
4. git add <resolved-files>
5. git rebase --continue (or git merge --continue)

Useful Commands

# Undo last commit (keep changes)
git reset --soft HEAD~1

# Stash with message
git stash push -m "description"

# Find commit that introduced bug
git bisect start
git bisect bad HEAD
git bisect good <known-good-commit>

# Cherry-pick specific commit
git cherry-pick <commit-hash>

# View file at specific commit
git show <commit>:<file>

Read the full file on GitHub · 116 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 · 116 lines · 0 tokens per session scan A f8c8f23911ac

Subscribe to this mod's changes

git-master is a skill published in the GitHub repository junghwaYang/oh-my-codex (5 stars, last pushed 6mo ago), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 640 tokens. 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

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

obra/superpowers · 37 tokens

chat-pet-sprite-creation

Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.

microsoft/vscode · 53 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

agent-host-chat-contributions

Build and review cross-cutting agent-host chat behavior through lifecycle contributions. Use when adding turn lifecycle side effects, prompt or context injection, restored-history transformation, protocol-action observation, or when reviewing changes that add code to AgentSideEffects or AgentService.

microsoft/vscode · 56 tokens

auto-perf-optimize

Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.

microsoft/vscode · 62 tokens