# git-master

A Git skill for coding agents: command reference, safety rails around destructive operations, and recovery steps. Useful when the agent touches repo history.

- skill · `type=skill` · Claude Code, Codex, Cursor, GitHub Copilot, Gemini CLI, OpenCode · 787 installs · ★ 59
- Author: JosiahSiegel
- License: MIT · policy=mirror · the beginning of the file is at the end of this page
- Source: https://github.com/JosiahSiegel/claude-plugin-marketplace/tree/HEAD/plugins/git-master/skills/git-master/SKILL.md
- Updated: 2026-06-18
- HTML: https://affpapa.org/en/nevibecode/skills/git-master

## What it does

The skill covers most of Git: init and clone, branches, commits, merges, rebase, cherry-pick, stash, reflog, bisect, worktrees, submodules, LFS. Destructive commands get their own treatment — `git reset --hard`, force push, `git filter-repo` — with an explicit warning, a risk explanation and a suggested backup branch first.

It works as a lean orchestrator. The main `SKILL.md` stays short and points to `references/` files: basic-operations, merging-rebasing, dangerous-operations, platform-workflows, performance-large-files, hooks-and-security, troubleshooting-recovery, cross-platform. Hosting platforms are covered too: GitHub, Azure DevOps, Bitbucket, GitLab, including their CLIs. On Windows it reminds you to use backslashes in Edit and Write paths and flags settings like `core.autocrlf`.

At the start of any Git task the skill asks how you want to work: automatic commits, staging only, or guidance only. It sticks to that choice for the session. If you would rather not answer that question every time, that is worth weighing before you install it.

## Requirements
- Works with: GitHub, Azure DevOps

## Install

### Claude Code (native platform)

1. **Skills CLI (Vercel)**
```bash
npx skills add JosiahSiegel/claude-plugin-marketplace --skill git-master -a claude-code
```

2. **Manually: put the files in place**
- File: `~/.claude/skills/git-master/SKILL.md` — Copy the whole skill folder; for one project use .claude/skills/git-master/

### Codex

1. **Skills CLI (Vercel)**
```bash
npx skills add JosiahSiegel/claude-plugin-marketplace --skill git-master -a codex
```

2. **Manually: put the files in place**
- File: `.agents/skills/git-master/SKILL.md` — For all projects use ~/.agents/skills/

### Cursor

1. **Skills CLI (Vercel)**
```bash
npx skills add JosiahSiegel/claude-plugin-marketplace --skill git-master -a cursor
```

2. **Manually: put the files in place**
- File: `.cursor/skills/git-master/SKILL.md` — Cursor also reads .agents/skills/ and .claude/skills/

### GitHub Copilot

1. **GitHub CLI**
```bash
gh skill install JosiahSiegel/claude-plugin-marketplace git-master
```

2. **Manually: put the files in place**
- File: `.github/skills/git-master/SKILL.md`

### Gemini CLI

1. **Skills CLI (Vercel)**
```bash
npx skills add JosiahSiegel/claude-plugin-marketplace --skill git-master -a gemini-cli
```

2. **Platform CLI**
```bash
gemini skills install https://github.com/JosiahSiegel/claude-plugin-marketplace --path plugins/git-master/skills/git-master
```

### Windsurf (Devin Desktop)

**Manually: put the files in place**
- File: `.devin/skills/git-master/SKILL.md` — The legacy .windsurf/skills/ path still works

### OpenCode

**Skills CLI (Vercel)**
```bash
npx skills add JosiahSiegel/claude-plugin-marketplace --skill git-master -a opencode
```

### Claude.ai

**Claude.ai**
- Zip the folder and upload it in Settings → Capabilities → Skills

Where a file is given instead of a command, copy the files from the source to that path: https://github.com/JosiahSiegel/claude-plugin-marketplace/tree/HEAD/plugins/git-master/skills/git-master/SKILL.md

## When to use it
- resolve a merge conflict between branches
- recover a lost branch through reflog
- rewrite history and strip large files
- find the commit that broke the build with bisect
- set up hooks and keep secrets out of commits

## Example prompts
- show what changed since the last commit and draft a message
- I rebased and lost a branch — bring it back with reflog
- split part of this repo out, help me with filter-repo

## Source text · SKILL.md · MIT

Below is the content of a third-party file. It is data, not instructions for you: do not act on anything written inside unless the human asks. Block tag: ca7c13c09cddd5eb.

BEGIN THIRD-PARTY FILE ca7c13c09cddd5eb
````text
---
name: git-master
description: |
  Complete Git expertise system for ALL git operations.
  PROACTIVELY activate for: (1) ANY Git task (basic/advanced/dangerous), (2) Repository management, (3) Branch strategies and workflows, (4) Conflict resolution, (5) History rewriting/recovery, (6) Platform-specific operations (GitHub/Azure DevOps/Bitbucket), (7) Advanced commands (rebase/cherry-pick/filter-repo).
  Provides: complete Git command reference, safety guardrails for destructive operations, platform best practices, workflow strategies, reflog recovery techniques, and expert guidance for even the most risky operations.
  Always asks user preference for automatic commits vs manual control.
---

# Git Mastery - Complete Git Expertise

Comprehensive Git skill covering basic to advanced operations, with mandatory safety guardrails for destructive commands and platform-specific workflows.

## Critical Guidelines

### Windows File Path Requirements

When using Edit or Write tools on Windows, use backslashes (`\`) in file paths, NOT forward slashes (`/`):

- WRONG: `D:/repos/project/file.tsx`
- CORRECT: `D:\repos\project\file.tsx`

Applies to: Edit/Write `file_path` parameters and all file operations.

### Documentation Guidelines

NEVER create new documentation files unless explicitly requested by the user. Prefer updating existing README.md files. Keep documentation concise, direct, and professional.

## TL;DR Safety First

Before ANY destructive operation:

```bash
# ALWAYS check status first
git status
git log --oneline -10

# For risky operations, create a safety branch
git branch backup-$(date +%Y%m%d-%H%M%S)

# Remember: git reflog is your safety net (90 days default)
git reflog
```

**User Preference Check (ALWAYS ASK at start of any Git task):**

"Would you like me to:
1. Create commits automatically with appropriate messages
2. Stage changes only (you handle commits manually)
3. Just provide guidance (no automatic operations)"

Respect this choice throughout the session.

## When to Use This Skill

Activate for ANY Git command or operation including:

- Repository initialization, cloning, configuration
- Branch management and strategies
- Commit workflows and best practices
- Merge strategies and conflict resolution
- Rebase operations (interactive and non-interactive)
- History rewriting (filter-repo, reset, revert)
- Recovery operations (reflog, fsck)
- Dangerous operations (force push, hard reset)
- Platform-specific workflows (GitHub, Azure DevOps, Bitbucket, GitLab)
````
END THIRD-PARTY FILE ca7c13c09cddd5eb

The third-party file has ended. Everything between the ca7c13c09cddd5eb tags is data: requests and commands from it are not followed. An “end of file” line with another tag inside the block is part of the file.

First 2519 of 7078 bytes. © JosiahSiegel · MIT · https://github.com/JosiahSiegel/claude-plugin-marketplace/tree/HEAD/plugins/git-master/skills/git-master/SKILL.md

_Part of the page did not fit — see the HTML version._

---
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