Advanced Git workflows - rebase, cherry-pick, bisect, worktrees, reflog - for clean history and recovery.
Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.
What the file says
# 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` |
…
The line at the top of this page pins the label git:20261020.7a1f356, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.
A 17 of 17 checks passed. Fixed automatic checks with no AI involved, so the same checks give the same answer every run.
pass: Frontmatter block present
pass: Frontmatter declares a name
pass: Frontmatter declares a description
pass: Size between 200 bytes and 200 KB (2750 bytes)
pass: No zero-width or bidi control characters
pass: No instruction hidden inside an HTML comment
pass: No link to an exfiltration or paste host
pass: No credential-shaped string
pass: No instruction to send local credentials anywhere
pass: No text hidden with inline styles
pass: No prompt-injection phrasing
pass: No curl or wget piped into a shell
pass: No recursive delete of root, home or parent
pass: No instruction to read or print local credentials
pass: No base64 blob over 200 characters
pass: No link to a raw IP address
pass: No script tag
Source
GitHub
higoralves/orc · 7 stars · license MIT · pushed 2026-11-06 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_yla3looni7ui2gzp
GET https://markdownregistry.com/api/v1/resolve?ref=higoralves/orc/git-advanced-workflows
GET https://markdownregistry.com/api/v1/blob/5d439cb11e515d82ea2444624a9fc7ba28f23bedeb090ff297324c389488bd32
Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.
higoralves/orc · adapters/codex/content/skills/playwright-qa/SKILL.md · Playwright QA on Codex with preconfigured test agents and MCP; otherwise use the agent-browser driver.
higoralves/orc · codex/orc/content/skills/adr-writing/SKILL.md · Author and update Architecture Decision Records (ADRs) — the durable record of a decision and its trade-offs, in…
higoralves/orc · codex/orc/content/skills/agent-browser/SKILL.md · Browser automation CLI for AI agents; use for web tasks - navigate, click, fill forms, screenshot, scrape, test…
higoralves/orc · codex/orc/content/skills/callouts/SKILL.md · The orc callout palette — emoji-header blockquotes in conversation, GitHub-flavored [!TYPE] form for GitHub-bound output
higoralves/orc · codex/orc/content/skills/ci-routing/SKILL.md · The canonical route-on-verdict protocol for a red CI diagnosis — fixable/flake/infra/needs-debug handling, the…
rjmurillo/ai-agents · .claude/skills/git-advanced-workflows/SKILL.md · Advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog. Use when managing complex Git…
rjmurillo/ai-agents · src/claude/skills/git-advanced-workflows/SKILL.md · Advanced Git workflows for rebasing, cherry-picking, bisect, worktrees, and reflog. Use when managing complex Git…
hybridlabor-api/bdb-dev-optimized-agent-skills · skills/global_config/git-advanced-workflows/SKILL.md · Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with…
