git:cherry-pick-helper

git:cherry-pick-helper is a command for Claude Code from geoffjay/claude-plugins. It costs 24 tokens per session (4,620 once invoked), scanned A, original, MIT.

A guided Git workflow for applying selected commits from one branch to another without merging the whole branch. It also assists with resolving conflicts during the operation.

In plain words
What is it for?
Use it to backport fixes, move hotfixes, recover commits, apply selected work to another branch, or test individual changes separately.
Why use it?
You may need one fix or feature on another branch without bringing across unrelated changes.

Command for Claude Code

Written for Claude Code: a Claude Code command (commands/*.md). Also seen: positional $N argument.

Good fit Use it to backport fixes, move hotfixes, recover commits, apply selected work to another branch, or test individual changes separately.

Compare 6 commands from other repositories ↓
Install with agentmods
npx agentmods add commands/geoffjay/claude-plugins/cherry-pick-helper
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.

Clone the repo
git clone --depth 1 https://github.com/geoffjay/claude-plugins

Made for: Claude Code.

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:cherry-pick-helper

README.md
[![agentmods](https://agentmods.dev/badge/commands/geoffjay/claude-plugins/cherry-pick-helper/github.svg)](https://agentmods.dev/commands/geoffjay/claude-plugins/cherry-pick-helper)
Your own site
<a href="https://agentmods.dev/commands/geoffjay/claude-plugins/cherry-pick-helper"><img src="https://agentmods.dev/badge/commands/geoffjay/claude-plugins/cherry-pick-helper/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:cherry-pick-helper

Your own site · 80×15
<a href="https://agentmods.dev/commands/geoffjay/claude-plugins/cherry-pick-helper"><img src="https://agentmods.dev/badge/commands/geoffjay/claude-plugins/cherry-pick-helper.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 24 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 4,620 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.00024 $0.04620
Opus 5.5 $0.00010 $0.01848
Sonnet 5.5 $0.00005 $0.00924
Haiku 4.5 $0.00002 $0.00462

Measured 1mo ago against content hash ea3601a1acc2, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

git:cherry-pick-helper 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 1mo 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.

plugins/utilities/git/commands/cherry-pick-helper.md · 746 lines

How it starts

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

Git Cherry-Pick Helper - Guided Commit Selection

Guided cherry-pick workflow with conflict resolution assistance for selectively applying commits across branches.

Command

/git:cherry-pick-helper <commit-ref> [additional-refs...]

Arguments

  • $1: commit-ref - Commit hash or reference to cherry-pick (required)
  • $2+: additional-refs - Additional commits to cherry-pick (optional, space-separated)

Description

Cherry-picking allows you to apply specific commits from one branch to another without merging the entire branch. This is useful for backporting bug fixes, applying specific features, or selectively moving work between branches.

When to Use Cherry-Pick

  • Backport bug fix to release branch
  • Apply hotfix from main to feature branch
  • Move specific commits to different branch
  • Recover commits from deleted branch
  • Apply commits from someone else's branch
  • Split work from one branch to multiple
  • Test specific changes in isolation

When NOT to Use Cherry-Pick

  • Can merge entire branch (use merge instead)
  • Commits depend on other commits not being picked
  • Would create duplicate history (rebase better)
  • On public/shared branches (coordinate with team)
  • Just testing changes (use worktree or stash)

Workflow

Pre-Cherry-Pick Analysis

  1. Validate commit reference:

    • Check commit exists
    • Verify commit is reachable
    • Can be from any branch or remote
  2. Show commit details:

    git show --stat <commit-ref>
    

    Display:

    • Commit hash (full and short)
    • Author and date
    • Commit message
    • Files changed with stats
    • Number of insertions/deletions
  3. Analyze commit context:

    • Show parent commits
    • Check if part of merge commit
    • Identify dependencies
    • Warn about potential issues
  4. Check current branch:

    • Show current branch name
    • Verify branch is clean
    • Check for uncommitted changes
    • Show last commit on current branch
  5. Predict conflicts:

    • Compare files in commit with current branch
    • Check if same files modified
    • Show potential conflict files
    • Estimate conflict probability

Read the full file on GitHub · 746 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. 1mo ago First seen · 746 lines · 24 tokens per session scan A ea3601a1acc2

Subscribe to this mod's changes

git:cherry-pick-helper is a command published in the GitHub repository geoffjay/claude-plugins (8 stars, last pushed 11mo ago), licensed MIT. It adds 24 tokens to every session and 4,620 once invoked, about $0.0001 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-03.