git-advanced-workflows

git-advanced-workflows is a skill for Claude Code, Codex from hybridlabor-api/bdb-dev-optimized-agent-skills. It costs 26 tokens per session (2,418 once invoked), scanned A, a copy of git-advanced-workflows, Apache-2.0.

A guide to advanced Git workflows for editing commit history, moving commits between branches, finding bug-causing changes, and recovering lost work.

In plain words
What is it for?
Use it when preparing pull requests, cleaning up commits before merging, synchronizing diverged branches, or investigating and recovering from Git problems.
Why use it?
It helps prevent messy history and gives you structured ways to handle mistakes, conflicting branches, and several features in progress.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one.

Needs its repository: it reads a path above its own folder, which exists only inside the repository. The line is git worktree add ../project-feature feature/new-feature.

Good fit Use it when preparing pull requests, cleaning up commits before merging, synchronizing diverged branches, or investigating and recovering from Git problems.

Compare 6 skills from other repositories ↓
Install

Getting it into your agent

It runs from inside its repository, so the clone comes first — what it calls does not travel with the file alone.

Clone the repo
git clone --depth 1 https://github.com/hybridlabor-api/bdb-dev-optimized-agent-skills
agentmods
npx agentmods add skills/hybridlabor-api/bdb-dev-optimized-agent-skills/git-advanced-workflows

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/hybridlabor-api/bdb-dev-optimized-agent-skills/git-advanced-workflows/github.svg)](https://agentmods.dev/skills/hybridlabor-api/bdb-dev-optimized-agent-skills/git-advanced-workflows)
Your own site
<a href="https://agentmods.dev/skills/hybridlabor-api/bdb-dev-optimized-agent-skills/git-advanced-workflows"><img src="https://agentmods.dev/badge/skills/hybridlabor-api/bdb-dev-optimized-agent-skills/git-advanced-workflows/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 git-advanced-workflows

Your own site · 80×15
<a href="https://agentmods.dev/skills/hybridlabor-api/bdb-dev-optimized-agent-skills/git-advanced-workflows"><img src="https://agentmods.dev/badge/skills/hybridlabor-api/bdb-dev-optimized-agent-skills/git-advanced-workflows.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 26 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 2,418 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 77% copy Near-identical to another mod 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.00026 $0.02418
Opus 5 $0.00013 $0.01209
Sonnet 5 $0.00005 $0.00484
Haiku 4.5 $0.00003 $0.00242

Measured 8d ago against content hash 8934f3b0910d, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-11, 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 8d 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.

Origin

This is a copy

77% identical to git-advanced-workflows — 237 lines differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.

skills/global_config/git-advanced-workflows/SKILL.md · 422 lines

How it starts

The opening of the file, as written. The whole thing — 422 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.

Do not use this skill when

  • The task is unrelated to git advanced workflows
  • You need a different domain or tool outside this scope

Instructions

  • Clarify goals, constraints, and required inputs.
  • Apply relevant best practices and validate outcomes.
  • Provide actionable steps and verification.
  • If detailed examples are required, open resources/implementation-playbook.md.

Use this skill when

  • 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

Core Concepts

1. Interactive Rebase

Interactive rebase is the Swiss Army knife of Git history editing.

Common Operations:

  • pick: Keep commit as-is
  • reword: Change commit message
  • edit: Amend commit content
  • squash: Combine with previous commit
  • fixup: Like squash but discard message
  • drop: Remove commit entirely

Basic Usage:

# Rebase last 5 commits
git rebase -i HEAD~5

# Rebase all commits on current branch
git rebase -i $(git merge-base HEAD main)

# Rebase onto specific commit
git rebase -i abc123

2. Cherry-Picking

Apply specific commits from one branch to another without merging entire branches.

# Cherry-pick single commit
git cherry-pick abc123

# Cherry-pick range of commits (exclusive start)
git cherry-pick abc123..def456

# Cherry-pick without committing (stage changes only)
git cherry-pick -n abc123

# Cherry-pick and edit commit message
git cherry-pick -e abc123

3. Git Bisect

Binary search through commit history to find the commit that introduced a bug.

# Start bisect
git bisect start

# Mark current commit as bad
git bisect bad

# Mark known good commit
git bisect good v1.0.0

# Git will checkout middle commit - test it
# Then mark as good or bad
git bisect good  # or: git bisect bad

# Continue until bug found
# When done
git bisect reset

Read the full file on GitHub · 422 lines

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. 8d ago First seen · 422 lines · 26 tokens per session scan A 8934f3b0910d

Subscribe to this mod's changes

git-advanced-workflows is a skill published in the GitHub repository hybridlabor-api/bdb-dev-optimized-agent-skills (6 stars, last pushed 7d ago), licensed Apache-2.0. It adds 26 tokens to every session and 2,418 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. It is 77% identical to git-advanced-workflows, differing in 237 lines, and is treated as a copy.