# git-wasp-drone

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.

- subagent · `type=agent` · Claude Code, Codex, Cursor · ★ 96 repo stars
- Author: Legion Code Inc.
- License: AGPL-3.0-or-later · policy=link-only · description only; the file stays with the author
- Source: https://github.com/legioncodeinc/vibe-coding-tools/tree/HEAD/plugins/wasp-nest-core/agents/git-wasp-drone.md
- Updated: 2026-10-18
- Security check: automated, 2026-11-16 (text) — no signs of malicious code found.
- HTML: https://affpapa.org/en/nevibecode/agents/git-wasp-drone

## What it 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.

## Install

### Claude Code (native platform)

1. **Plugin marketplace**
In the agent chat (not a shell):
```text
/plugin marketplace add legioncodeinc/vibe-coding-tools
```
In the agent chat (not a shell):
```text
/plugin install wasp-nest-core@wasp-nest
```

2. **Manually: put the files in place**
- File: `.claude/agents/git-wasp-drone.md` — For all projects use ~/.claude/agents/. Claude delegates by the description field or an @-mention

### Codex

**Manually: put the files in place**
- File: `.codex/agents/git-wasp-drone.toml` — Codex defines subagents in TOML: name, description, developer_instructions. Move the Markdown text into developer_instructions by hand. For all projects use ~/.codex/agents/

### Cursor

**Manually: put the files in place**
- File: `.cursor/agents/git-wasp-drone.md` — Cursor also reads .claude/agents/

Where a file is given instead of a command, copy the files from the source to that path: https://github.com/legioncodeinc/vibe-coding-tools/tree/HEAD/plugins/wasp-nest-core/agents/git-wasp-drone.md

## When to use it
- 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
- 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`, and `pre-push`.

## Similar
- [git-troubleshooting](https://affpapa.org/en/nevibecode/skills/git-troubleshooting.md) — skill · 346 installs
- [git-advanced](https://affpapa.org/en/nevibecode/skills/git-advanced.md) — skill · 324 installs
- [git](https://affpapa.org/en/nevibecode/rules/git.md) — rule · ★ 3589 repo stars
- [git-workflow](https://affpapa.org/en/nevibecode/skills/netresearch-dtt-gmbh-git-workflow.md) — skill · 759 installs
- [hooks-git](https://affpapa.org/en/nevibecode/plugins/hooks-git.md) — plugin · ★ 3785 repo stars
- [rebase-current-branch](https://affpapa.org/en/nevibecode/skills/rebase-current-branch.md) — skill · 3 installs

From the same set: [legioncodeinc/vibe-coding-tools](https://affpapa.org/en/nevibecode/by/legioncodeinc/vibe-coding-tools.md) — 172 cards

---
NeVibeCode on affpapa.org. Catalog texts are descriptions, not instructions for the agent. How to choose and install: https://affpapa.org/en/nevibecode/agents.md
