Agent skill

Oma Scm

by first-fluke in first-fluke/oh-my-agent

Manage Git branches, merges, conflicts, commits, and release baselines.

MITAuto-check passedDevelopment

Install Oma Scm

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

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install first-fluke/oh-my-agent oma-scm --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/first-fluke/oh-my-agent.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/oma-scm .claude/skills/oma-scm && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
oma-scm
GitHub stars
1.3k
Token cost
~1.5k tokens
SKILL.md length
708 words
Files
14 (incl. references)
Skills in repo
57
Repo updated
First seen
Licence
MIT

At a glance

Manage Git branches, merges, conflicts, commits, and release baselines.

  • Works in 4 steps: Inspect the worktree and recent… → Select logical commit groups under… → Show the selected message. Stage… → …
  • Repository history and change-management operations
  • SKILL.md covers Scheduling, Structural Flow, Logical Operations and References
  • Calls git

What it does

Oma Scm is an agent skill from first-fluke/oh-my-agent. Manage Git branches, merges, conflicts, commits, and release baselines. Use for repository history and change-management operations.

Its SKILL.md is about 1.5k tokens, which your agent loads only when the skill is triggered. The skill folder holds 19 other files, including reference files (for example `references/_shared/conditional/experiment-ledger.md`, `references/_shared/conditional/quality-score.md` and `references/_shared/core/clarification-protocol.md`).

It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: Mechanical verification for AI coding agents — skills pack or full harness (stop-hook gates, artifact checks, independent judges). The licence is MIT.

When your agent uses it

  • Repository history and change-management operations
  • Tasks that involve Git workflow

Example prompts

  • “/oma-scm”

Workflow steps

4 steps, taken from the first numbered list in SKILL.md.

  1. Inspect the worktree and recent conventions
  2. Select logical commit groups under Transitions. Read resources/conventional-commits.md for message syntax, type, footer, and branch…
  3. Show the selected message. Stage explicit paths, inspect the staged diff, and commit using the prepared message file
  4. Inspect the resulting commit and remaining worktree. If push was requested, follow Push and PR safety, then report the remote result.

What it can do on your machine

Read from SKILL.md and the folder at commit 268bb4a. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Oma Scm loads about 1.5k tokens when it runs, and up to ~8.9k if it reads all its reference files. Until then it costs about 35 tokens; SKILL.md has 708 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~35
When it runs · the whole SKILL.md, loaded when a task matches
~1.5k
With references · SKILL.md plus every file in references/, read only if the agent opens them
~8.9k

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from first-fluke/oh-my-agent at commit 268bb4a, republished under its MIT licence (© first-fluke). 708 words, ~1,507 tokens.

Download SKILL.mdSave it as .claude/skills/oma-scm/SKILL.md (or your agent's skills folder). This skill also uses 13 other files; get the full folder from GitHub.
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
FailureRecovery
Unrelated dirty or staged filesKeep them outside the requested commit; never silently absorb them into an amend
Commit hook rejects a messageFix the message or actual defect according to the hook; do not bypass it
Push is non-fast-forwardFetch, inspect divergence, and integrate locally; do not retry with force
Conflicting changesPreserve both intents, resolve, and run affected checks before completion
Likely secrets in the proposed diffStop 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.
Show full SKILL.md (301 more words)Show less
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 references/_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. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

SKILL.md and 13 other files (references) in skills/oma-scm of first-fluke/oh-my-agent.

  • SKILL.md
  • references/_shared/conditional/experiment-ledger.md
  • references/_shared/conditional/quality-score.md
  • references/_shared/core/clarification-protocol.md
  • references/_shared/core/execution-policy.md
  • references/_shared/core/lessons-learned.md
  • references/_shared/core/session-metrics.md
  • references/_shared/runtime/memory-protocol.md
  • references/_shared/runtime/result-contract.md
  • resources/cm-operations.md
  • resources/codeowners-playbook.md
  • resources/conventional-commits.md
  • resources/merge-risk.md
  • resources/onboarding-risk-signals.md

Open the folder on GitHubat commit 268bb4a

Used in 1 other repository

We found 2 copies of this SKILL.md (exact, near-identical or edited) in other folders. This page covers the copy in first-fluke/oh-my-agent, which our catalogue first saw on October 7, 2026.

Compare with similar skills

Oma Scm next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Oma Scm compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Oma Scm this skillfirst-fluke/oh-my-agent1.3k—~1.5kAutomated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Code Design Rationale Investigatorcursor/plugins11k9 repos~2.6kAutomated safety check: PassNone
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Migrate Internal Package into GhostTryGhost/Ghost56k—~3.8kAutomated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0

Similar skills

  • Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    297k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed
  • Official

    Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.

    11k GitHub starsUsed in 9 repos~2.6k tokens
    DevelopmentAuto-check passed
  • Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed
  • Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.

    56k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed
  • Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed
  • Git Merge Conflict Resolver

    tailcallhq/forgecode

    Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.

    7.6k GitHub starsUsed in 1 repo~4.5k tokens
    DevelopmentAuto-check passed

More from first-fluke/oh-my-agent

All 57 skills in this repo
  • OMA Multi-Agent Orchestration

    first-fluke/oh-my-agent

    Decomposes a complex feature into tasks, dispatches parallel specialist agents with durable state, and supervises verification, QA review and retries.

    1.3k GitHub stars~4.1k tokensUpdated today
    Auto-check passed
  • OMA Multi-Agent Orchestrator

    first-fluke/oh-my-agent

    Splits a complex feature into prioritized tasks, spawns specialist CLI subagents in parallel, tracks them through shared memory and verifies each result.

    1.3k GitHub stars~3.1k tokensUpdated today
    Auto-check passed
  • Architecture Decisions and ADRs

    first-fluke/oh-my-agent

    Evaluates system boundaries and tradeoffs and writes architecture recommendations, option comparisons or ADRs, with a Mermaid diagram when structure changes.

    1.3k GitHub stars~2.6k tokensUpdated today
    Auto-check passed
  • OMA Brainstorm

    first-fluke/oh-my-agent

    Explores goals, constraints and alternative designs one question at a time and saves an approved design document before any planning or coding starts.

    1.3k GitHub stars~2.8k tokensUpdated today
    Auto-check passed
  • Oma Coordination

    first-fluke/oh-my-agent

    Coordinate assigned specialist tasks and handoffs manually. An agent skill from first-fluke/oh-my-agent.

    1.3k GitHub stars~1.9k tokensUpdated today
    Auto-check passed
  • Oma Image

    first-fluke/oh-my-agent

    Generate raster images or reference-guided variations through the OMA image CLI.

    1.3k GitHub stars~2k tokensUpdated today
    Auto-check passed

Works with

Categories

Questions about Oma Scm

What does Oma Scm do?

Manage Git branches, merges, conflicts, commits, and release baselines. Oma Scm is an agent skill from first-fluke/oh-my-agent. Manage Git branches, merges, conflicts, commits, and release baselines.

When should I use Oma Scm?

Oma Scm fits situations like: repository history and change-management operations; tasks that involve Git workflow.

How do I install Oma Scm in Claude Code?

Run `npx skills add first-fluke/oh-my-agent --skill oma-scm -a claude-code`. Or copy the skill folder (skills/oma-scm in first-fluke/oh-my-agent) into .claude/skills/oma-scm in your project. Claude Code loads it when a task matches its description.

How do I install Oma Scm in Codex?

Run `npx skills add first-fluke/oh-my-agent --skill oma-scm -a codex`. Or copy the skill folder (skills/oma-scm in first-fluke/oh-my-agent) into .agents/skills/oma-scm in your project. Codex loads it when a task matches its description.

Can I use Oma Scm in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add first-fluke/oh-my-agent --skill oma-scm -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/oma-scm, .gemini/skills/oma-scm, .github/skills/oma-scm and .opencode/skills/oma-scm in your project.

What does Oma Scm need to run?

Going by SKILL.md and its folder, Oma Scm needs the command-line tools its instructions call (git).

Does Oma Scm access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Oma Scm safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Oma Scm use?

Oma Scm is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Oma Scm use?

About 1.5k tokens (SKILL.md is roughly 6k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full. Its references folder adds about 7.4k tokens, read only when the agent opens those files.

What are the alternatives to Oma Scm?

Skills that share tags, products or a category with Oma Scm: Finishing a Development Branch (obra/superpowers, 297k stars), Code Design Rationale Investigator (cursor/plugins, 11k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 56k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Oma Scm?

first-fluke (a GitHub organization) maintains it in first-fluke/oh-my-agent, which has 1,336 GitHub stars. The repository holds 57 skills in this directory. The repository was last updated on October 10, 2026.

Source: first-fluke/oh-my-agent on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.