omh-git-workflow

omh-git-workflow is a skill for Claude Code, Codex from rlaope/oh-my-hermes. It costs 94 tokens per session (1,895 once invoked), scanned A, original, MIT.

A workflow for repairing Git branches and history, including merge conflicts, history cleanup, and finding earlier changes with bisect. Git is the version-control system used to track code changes.

In plain words
What is it for?
It helps resolve merge conflicts, repair or clean up history, and use Git bisect to find a change that introduced a problem.
Why use it?
It adds a cautious process for changes that can affect shared branch history, including identifying what is already pushed and keeping a recovery point.

Skill for Claude CodeCodex

Which agent this was written for is unclear — built for openclaw. Also seen: mentions subagents; mentions Claude Code; mentions Codex.

Good fit It helps resolve merge conflicts, repair or clean up history, and use Git bisect to find a change that introduced a problem.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/rlaope/oh-my-hermes/omh-git-workflow
About the project

oh-my-hermes is an operating layer for Hermes Agent that organizes requests into workflows for planning, research, creation, coding handoffs, operations, and project memory. Hermes users run these workflows through the desktop app, CLI, or messenger app, while the catalogue add-ons extend its native capabilities.

rlaope/oh-my-hermes · 3,392 stars · on GitHub · rlaope.github.io

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.

Any agent
npx skills add rlaope/oh-my-hermes --skill omh-git-workflow
Clone the repo
git clone --depth 1 https://github.com/rlaope/oh-my-hermes

Made for: Claude Code, Codex.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for omh-git-workflow

README.md
[![agentmods](https://agentmods.dev/badge/skills/rlaope/oh-my-hermes/omh-git-workflow/github.svg)](https://agentmods.dev/skills/rlaope/oh-my-hermes/omh-git-workflow)
Your own site
<a href="https://agentmods.dev/skills/rlaope/oh-my-hermes/omh-git-workflow"><img src="https://agentmods.dev/badge/skills/rlaope/oh-my-hermes/omh-git-workflow/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for omh-git-workflow

Your own site · 80×15
<a href="https://agentmods.dev/skills/rlaope/oh-my-hermes/omh-git-workflow"><img src="https://agentmods.dev/badge/skills/rlaope/oh-my-hermes/omh-git-workflow.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 94 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,895 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
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.1 $0.00094 $0.01895
Opus 5.5 $0.00038 $0.00758
Sonnet 5.5 $0.00019 $0.00379
Haiku 4.5 $0.00009 $0.00189

Measured 3d ago against content hash 47bbd5d626d7, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

omh-git-workflow 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 3d 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.

agent-skills/omh-git-workflow/SKILL.md · 140 lines

How it starts

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

Git Workflow

This is an OMH git-workflow workflow skill, projected for Agent Skills hosts (Claude Code, Codex, Cursor, opencode, OpenClaw, pi).

Why This Exists

git-workflow exists because conflict resolution, bisect, and history repair had no owner: "resolve this merge conflict" reached a file operator and "clean up this branch's history" a live-information lane, while this repository's own incidents -- a stack that replayed its base commits, a commit landing on another session's branch -- each had a known correct procedure.

First Steps

  • Name what is already pushed: each branch involved with its local head, its remote head, and whether others may have fetched it.
  • Before any step that rewrites history, name its recovery point.

Do Not Use When

  • The request is to write the commit message or the PR body for a finished change; use omh-commit-pr-authoring.
  • The request is to find defects in a diff before merging it; use omh-code-review.
  • The build or CI job fails and the question is why; use omh-build-failure-triage.
  • The request is a code change to deliver rather than branch or history repair; use ulw-work.

Examples

Good example:

  • Prompt: clean up this branch's history before review
  • Expected behavior: Prepare pushed_state_inventory/v1 first, then history_rewrite_plan/v1 with a backup branch before the interactive rebase and --force-with-lease for the push, naming who must re-fetch.
  • Why: Whether the branch is pushed decides whether the cleanup is local or shared.

Bad example:

  • Prompt: just force push my rebased branch over main
  • Expected behavior: Refuse the bare force-push: inventory what is pushed on main, and plan --force-with-lease onto the feature branch only.
  • Why: A bare force-push over a shared branch discards other people's commits without a check.

Completion Checklist

  • The pushed-state inventory names every branch the plan touches.
  • Every rewriting step has a recovery point in front of it.
  • Every force-push in the plan uses --force-with-lease.
  • Generated and counted files in a conflict are re-derived, not picked.
  • Resolution, bisect verdict, and push are reported only from observed output.

Read the full file on GitHub · 140 lines

Files

What ships with it

1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

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. 3d ago Changed · +1 lines 47bbd5d626d7
  2. 16d ago Changed · +3 lines 8c9f2288e211
  3. 19d ago First seen · 136 lines · 94 tokens per session scan A 60eb92b8c462

Subscribe to this mod's changes

omh-git-workflow is a skill published in the GitHub repository rlaope/oh-my-hermes (3,392 stars, last pushed today), licensed MIT. It adds 94 tokens to every session and 1,895 once invoked, about $0.0004 per session on Opus 5.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-09-28.