git-advanced-workflows

git-advanced-workflows is a skill for Claude Code, Codex from HigorAlves/orc. It costs 47 tokens per session (607 once invoked), scanned A, original, MIT.

Advanced Git workflows - rebase, cherry-pick, bisect, worktrees, reflog - for clean history and recovery. Use when managing complex histories, collaborating on branches, or troubleshooting a repo.

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/higoralves/orc/git-advanced-workflows
Any agent
npx skills add HigorAlves/orc --skill git-advanced-workflows
Clone the repo
git clone --depth 1 https://github.com/HigorAlves/orc

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 git-advanced-workflows

README.md
[![agentmods](https://agentmods.dev/badge/skills/higoralves/orc/git-advanced-workflows.svg)](https://agentmods.dev/skills/higoralves/orc/git-advanced-workflows)
Your own site
<a href="https://agentmods.dev/skills/higoralves/orc/git-advanced-workflows"><img src="https://agentmods.dev/badge/skills/higoralves/orc/git-advanced-workflows.svg" alt="Measured on agentmods" height="20"></a>
Per session 47 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 607 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin unknown 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.00047 $0.00607
Opus 5 $0.00023 $0.00303
Sonnet 5 $0.00009 $0.00121
Haiku 4.5 $0.00005 $0.00061

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

Security

Grade A, and why

git-advanced-workflows 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 today.

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.

orc/skills/git-advanced-workflows/SKILL.md · 45 lines

How it starts

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

Git Advanced Workflows

Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence.

When to Use This Skill

  • Cleaning up commit history before merging
  • Applying specific commits across branches
  • Finding commits that introduced bugs
  • Working on multiple features simultaneously
  • Recovering from Git mistakes or lost commits
  • Managing complex branch workflows
  • Preparing clean PRs for review
  • Synchronizing diverged branches

Which Tool for Which Situation

Situation Tool Reference
Clean up / squash / reword / reorder / split commits before a PR Interactive rebase references/rebase.md
Update a feature branch with main, decide rebase vs merge Rebase / merge references/rebase.md
Apply a single commit (e.g. hotfix) to other branches/releases Cherry-pick references/cherry-pick.md
Apply only specific files from a commit Partial cherry-pick references/cherry-pick.md
Find the commit that introduced a bug Bisect references/bisect.md
Work on multiple branches at once without stashing Worktrees references/worktrees.md
Recover lost commits / deleted branches / undo a bad reset Reflog & recovery references/reflog-recovery.md
Abort an in-progress rebase/merge/cherry-pick/bisect Recovery commands references/reflog-recovery.md
Safety rules before rewriting shared history Best practices & pitfalls references/history-rewrite.md

Read the matching references/*.md file when you need the detailed commands and worked examples for that situation. Load only the references relevant to the task at hand.

References

  • references/rebase.md - interactive rebase operations, clean-up-before-PR workflow, rebase vs merge strategy, autosquash, splitting commits.
  • references/cherry-pick.md - cherry-picking single commits/ranges, hotfix-to-multiple-releases workflow, partial (per-file) cherry-pick.
  • references/bisect.md - manual and automated git bisect to locate a bug-introducing commit.
  • references/worktrees.md - managing multiple worktrees for simultaneous multi-branch development.
  • references/reflog-recovery.md - using reflog to recover lost commits/branches, undo resets, and abort in-progress operations.
  • references/history-rewrite.md - cross-cutting best practices and common pitfalls when rewriting history (force-with-lease, backups, public branches).

Read the full file on GitHub · 45 lines

Files

What ships with it

6 files 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. today First seen · 45 lines · 47 tokens per session scan A babfe75bfcde

Subscribe to this mod's changes

git-advanced-workflows is a skill published in the GitHub repository HigorAlves/orc (6 stars, last pushed 7d ago), licensed MIT. It adds 47 tokens to every session and 607 once invoked, about $0.0002 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-09-03.