git-wasp-drone — Claude Code subagent: Git and setup
git-wasp-drone — a Git subagent for rebase, conflict recovery, hooks, worktrees, and large files. Use it when a routine Git task turns into a history or workflow problem.
AGPL-3.0-or-later ★ 96 updated 2026-10-18
/plugin marketplace add legioncodeinc/vibe-coding-tools
/plugin install wasp-nest-core@wasp-nestWhat git-wasp-drone does
git-wasp-drone covers everyday Git and harder repository work: interactive rebase, conflict handling, history rewriting, reset and reflog recovery, worktrees, client-side hooks, submodules, subtrees, and Git LFS. It also addresses partial clones and sparse checkout.
For beginner lessons, it creates a disposable practice repository with synthetic files instead of changing a real project. Before destructive operations, the subagent presents a recovery path first. Secret-removal cases hand credential rotation to security-wasp-drone, while CI Git configuration and server-side hooks belong with devops-wasp-drone.
Claude Code setup adds the marketplace and installs wasp-nest-core, followed by the agent file. Codex and Cursor use their own agent-file paths. Advanced Git features require a version check before they are recommended.
What it helps with
- learn Git basics in a disposable practice repository
- combine commits with interactive rebase
- recover deleted branches or commits through reflog
- resolve merge and rebase conflicts
- configure hooks, worktrees, or Git LFS
Example prompts for the agent
- Show me how to squash these commits with interactive rebase, and give me the recovery step first.
- I deleted a branch by mistake. Help me find and restore it with reflog.
- Set up Git hooks for this project and explain the roles of
pre-commit,commit-msg, andpre-push.
How to install git-wasp-drone
1Plugin marketplace
/plugin marketplace add legioncodeinc/vibe-coding-tools/plugin install wasp-nest-core@wasp-nest2Manually: put the files in place
.claude/agents/git-wasp-drone.mdFor all projects use ~/.claude/agents/. Claude delegates by the description field or an @-mention
Manually: put the files in place
.codex/agents/git-wasp-drone.tomlCodex defines subagents in TOML: name, description, developer_instructions. Move the Markdown text into developer_instructions by hand. For all projects use ~/.codex/agents/
Manually: put the files in place
.cursor/agents/git-wasp-drone.mdCursor also reads .claude/agents/
Step by step, with commands for each platform: Claude Code subagents: how to create one, call it and keep context clean
Questions about git-wasp-drone
How do I install git-wasp-drone in Claude Code?
Run /plugin marketplace add legioncodeinc/vibe-coding-tools, then /plugin install wasp-nest-core@wasp-nest, and open .claude/agents/git-wasp-drone.md.
What does git-wasp-drone do?
It handles Git workflow questions involving rebase, conflicts, history rewriting, reflog recovery, worktrees, hooks, large files, and the submodules-versus-subtrees choice.
Can git-wasp-drone handle a secret committed to Git history?
It can guide the history cleanup, but credential rotation is handed to security-wasp-drone. Removing the secret from Git does not reverse its exposure.