Skip to main content
skill CX Codex

oma-scm · first-fluke — Claude Code and Codex skill for Git history management

oma-scm — a skill that gives an agent a safe process for commits, branches, merges and conflict resolution. Use it when repository history matters and a careless force-push is not an option.

MIT ★ 1,472 updated 2026-10-29

Install into Claude Code · Plugin marketplace All methods and platforms ↓
/plugin marketplace add first-fluke/oh-my-agent
/plugin install oma@oh-my-agent
Open on GitHub

What oma-scm does

The oma-scm skill from oh-my-agent turns Git operations into a sequence of inspected steps: check the worktree, group changes logically, stage explicit paths, commit with a prepared message, verify the result. It handles commit and push requests, branch and history work, releases, baselines, CODEOWNERS and configuration-management reviews.

Guards are built in. The agent never runs git add -A without approval, never rewrites shared history without an explicit instruction, and uses --force-with-lease instead of plain --force. If the project config has scm.require_pr_for_default_branch, default-branch changes go through a topic branch and PR. A commit hook rejecting a message means fixing the defect, not bypassing the hook.

The skill needs Git CLI plus the project configuration and hooks. It reads separate resource files for larger tasks: merge-risk.md for big merges, cm-operations.md for governance and releases, conventional-commits.md for message syntax. For features or bug fixes it steps aside — that work belongs to other specialists in the ecosystem.

What it helps with

  • split mixed changes into logical commits
  • write a Conventional Commit message and pick a branch name
  • resolve a merge conflict without losing either intent
  • review a staged diff before amending
  • plan a large merge with rollback steps

Example prompts for the agent

  • Commit the changes in src/api.ts and tests/api.test.ts as one logical commit
  • Create branch fix/login-timeout and open a PR instead of pushing to main
  • Resolve the conflict in package-lock.json and keep both dependency versions

How to install oma-scm

1Plugin marketplace

/plugin marketplace add first-fluke/oh-my-agent
/plugin install oma@oh-my-agent

This installs the whole oma plugin with all its skills

2Skills CLI (Vercel)

npx skills add first-fluke/oh-my-agent --skill oma-scm -a claude-code

3Manually: put the files in place

~/.claude/skills/oma-scm/SKILL.md

Copy the whole skill folder; for one project use .claude/skills/oma-scm/

Step by step, with commands for each platform: How to install skills in Claude Code: five ways

Questions about oma-scm

How do I install oma-scm in Claude Code?

Through the marketplace: /plugin marketplace add first-fluke/oh-my-agent, then /plugin install oma@oh-my-agent. Or run npx skills add first-fluke/oh-my-agent --skill oma-scm -a claude-code.

What does oma-scm do?

It manages Git history: commits, branches, merges, rebases, conflict resolution, worktrees and release baselines. The agent follows a process with explicit scope and checks before each step.

Why does the skill avoid direct pushes to the default branch?

When scm.require_pr_for_default_branch is true in project config, changes go through a topic branch and PR. A direct push requires an explicit instruction from the user.

Source text

SKILL.md · MIT
---
name: oma-scm
description: "Manage Git branches, merges, conflicts, commits, and release baselines. Use for repository history and change-management operations."
---

# Software Configuration Management

## Scheduling

### Goal
Perform Git operations with explicit scope, traceable commits, and recoverable history.

### Intent signature
- Commit, stage, push, branch, merge, rebase, resolve conflicts, manage worktrees, or inspect SCM governance.

### When to use
- Commit and push requests, including Conventional Commit messages and logical splitting.
- Branch/history operations, releases, baselines, CODEOWNERS, and configuration-management reviews.

### When NOT to use
- Implementing a feature or fixing application code -> use the owning specialist.
- General requirements planning -> use `oma-pm`; security/testing review -> use `oma-qa`.

### Expected inputs
Requested Git operation, repository state, and effective `scm` settings from project configuration.

### Expected outputs
Requested Git changes or an advisory plan, commit/branch identifiers, checks performed, and unresolved work.

### Dependencies
Git CLI; project configuration and hooks. Read the references below only for the selected operation.

## Structural Flow

### Entry
Inspect branch, upstream, staged/unstaged changes, and existing authorization. Select the commit path below or the configuration-management resource for broader operations.

### Transitions
- Commit-only request: finish after committing. Push or create a PR only when requested or required by the applicable workflow.
- Independent changes: split by feature. One logical change remains one commit even across code, tests, and docs; an explicit grouping instruction wins. File count is only a tiebreaker (at most five files lean single).
- Governance, worktrees, releases, or history operations: load `resources/cm-operations.md`.
- Large merges: load `resources/merge-risk.md` before selecting merge order or recovery steps.
- Default-branch push: apply the Push and PR safety section below.

### Failure and recovery
| Failure | Recovery |
|---|---|
| Unrelated dirty or staged files | Keep them outside the requested commit; never silently absorb them into an amend |
| Commit hook rejects a message | Fix the message or actual defect according to the hook; do not bypass it |
| Push is non-fast-forward | Fetch, inspect divergence, and integrate locally; do not retry with force |
| Conflicting changes | Preserve both intents, resolve, and run affected checks before completion |
| Likely secrets in the proposed diff | Stop before staging and identify the affected path without exposing the value |

### Exit
Report created commits/refs and verification. A failed commit, rejected push, or unresolved conflict is not completion.

## Logical Operations

### Canonical command path
1. Inspect the worktree and recent conventions:
   ```bash
   git status -sb
   git diff --staged
   git diff
   git log --oneline -5
   ```
2. Select logical commit groups under Transitions. Read `resources/conventional-commits.md` for message syntax, type, footer, and branch naming; apply repository hook/config limits.
3. Show the selected message. Stage explicit paths, inspect the staged diff, and commit using the prepared message file:
   ```bash
   git add -- <specific-files>
   git diff --cached --check
   git diff --cached
   git commit -F <message-file>
   ```
4. Inspect the resulting commit and remaining worktree. If push was requested, follow Push and PR safety, then report the remote result.

### Guardrails
1. Explicit, unambiguous user instructions take precedence over SCM defaults, including commit grouping and direct default-branch pushes. Existing authorization persists; do not ask for it again. Likely-secret material still requires stopping before staging.
2. Stage explicit paths. Do not use `git add -A` or `git add .` without explicit authorization, and never include credentials or secret files.
3. Do not rewrite shared history without explicit authorization. For an authorized rewrite, use `--force-with-lease`, never plain `--force`.
4. Read the staged diff before an amend. Unpushed commits may be amended or reorganized within the requested scope; pushed commits are shared history.
5. User-facing responses follow the configured language; commit messages, branch names, and PR titles/bodies stay in English.

### Push and PR safety (only when requested)
- Confirm the branch, upstream, and ahead/behind state before pushing.
- If `scm.require_pr_for_default_branch` is true, use a topic branch and PR for default-branch changes, unless the user explicitly requested a direct push.
- Keep the repository's required hooks/checks. A failure requires repair or an accurate partial result, not an assertion of success.
- Verify that the requested commits reached the intended remote branch.

### Amend, fixup, autosquash
Determine whether the target commit is shared using `git log --oneline @{u}..HEAD` when an upstream exists. If there is no upstream, inspect remote refs before assuming a commit is unshared. Keep unrelated staged changes out of the operation.

### Resource scope and effects
Git operations change the index, local commits/refs, worktrees, and possibly remote refs. Read only relevant project configuration; never copy credential values into messages or reports. Apply `.agents/skills/_shared/core/execution-policy.md` to authorization and verification.

## References
- Commit syntax, types, co-author policy, and branch naming: `resources/conventional-commits.md` (commit requests)
- Configuration-management operations: `resources/cm-operations.md` (governance/history/worktree tasks)
- Merge risk and rollback: `resources/merge-risk.md` (large merges)
- Ownership detail: `resources/codeowners-playbook.md` (CODEOWNERS work)
- Onboarding indicators: `resources/onboarding-risk-signals.md` (repository-risk assessment)
- Release observability: `../oma-observability/SKILL.md` §Integrations (release markers and baseline comparisons)

© First Fluke · MIT · first-fluke/oh-my-agent

Similar skills

All skills for Git and GitHub →

oma-scm by other authors comes first.

oma-scm First Fluke oma-scm is a Claude Code skill for safe Git work, from commits and branches to conflict handling. It activates on requests involving releases, worktrees, or repository history. CX Codex +1 ★ 1,472repo stars merge-open-prs jssblck The merge-open-prs skill plans and merges a fixed set of open pull requests through GitHub. Use it when several PRs must land in a controlled order. CX Codex +1 1,700installs merge Alireza Rezvani A Claude skill that merges the top-ranked agent's branch into base, archives the rest as tags, and cleans up worktrees. Useful once an AgentHub session is done. CX Codex +1 1,409installs git-workflows miles990 git-workflows is a Claude Code skill with recipes for branching, daily Git commands, undo steps, and commit hooks. The agent reads them from one skill file. CX Codex +1 114installs standup thedotmack standup is a Claude Code skill that compares Git worktrees, branches, or selected PRs through a shared agent discussion. It produces a consolidation plan without merging changes. CX Codex +1 3,800installs pull-changes-resolve-conflicts cognitedata pull-changes-resolve-conflicts — a skill that walks the agent through branch merges: it reports conflicts and asks first, edits later. Useful on projects with several contributors. CX Codex +1 1,900installs swarm-ci-monitor ZaxbyHub swarm-ci-monitor is a Claude Code skill that monitors approved PRs, diagnoses CI failures, applies fixes for up to five cycles, and merges when required checks pass. CX Codex +1 ★ 539repo stars

From the same set69

The whole set →
docs-curator docs-curator — a subagent that detects documentation drift and updates MD files when code changes. Catches broken references, proposes patches, and keeps docs/**/*.md aligned with the codebase. CX Codex ★ 1,472repo stars i18n-guide The i18n-guide rule sets how agents choose a response language and which project text gets localized. It fits workflows that need consistent language handling across user-facing output and code. CX Codex +1 ★ 1,472repo stars frontend frontend — a rule for React and Next.js projects: shadcn/ui components, Tailwind CSS v4, FSD-lite architecture, Server Components by default. CX Codex +1 ★ 1,472repo stars oma-docs Verifies documentation links, syncs docs against Git diffs, and flags translation drift. Runs through the oma docs CLI or falls back to manual markdown parsing. CX Codex +1 ★ 1,472repo stars oma-skill-creation oma-skill-creation is a Claude Code skill for building and refining OMA skills in SSL-lite format for Claude Code and Codex. It runs during authoring, routing reviews, and contract validation. CX Codex +1 ★ 1,472repo stars oma-mobile oma-mobile — a mobile-focused skill: it builds screens and widgets in Flutter or React Native, wires camera, GPS, push and offline handling, then runs the checks. CX Codex +1 ★ 1,472repo stars oma-debug oma-debug — a skill for Claude Code and Codex isolates bugs, writes targeted fixes, and creates regression tests. Runs when tests fail, services crash, or code suffers from race conditions. CX Codex +1 ★ 1,472repo stars oma-qa The oma-qa skill for Claude Code and Codex reviews changes for security, performance, accessibility, and correctness. It checks a diff, runs relevant tools, and reports reproducible findings with fixes. CX Codex +1 ★ 1,472repo stars

Project sponsors

Companies that keep this analytics open