# git-workflow

A skill for safer local Git work: branch cleanup, commit edits, conflict handling, history recovery, and review-ready diffs.

- skill · `type=skill` · Claude Code, Codex, Cursor, GitHub Copilot, Gemini CLI, OpenCode · 353 installs · ★ 51
- Author: akillness
- License: not stated · policy=link-only · description only; the file stays with the author
- Source: https://github.com/akillness/jeo-skills/tree/HEAD/.agent-skills/git-workflow/SKILL.md
- Updated: 2026-10-24
- HTML: https://affpapa.org/en/nevibecode/skills/akillness-git-workflow

## What it does

git-workflow inspects the local repository situation and routes the task into one focused path: branch preparation, commit cleanup, syncing with a base branch, conflict handling, push safety, or recovery. It helps choose between merge and rebase, stage selected changes, and prepare a cleaner review diff.

Before risky operations, the skill checks the current branch, worktree, and recent history. Rewritten branches use `git push --force-with-lease`, while shared history is undone with `git revert`; recovery can use `git reflog` and a rescue branch. The skill is intended for a working Git CLI and local repository state, not hosted PR workflows, repository administration, or sprint planning.

## Install

### Claude Code (native platform)

1. **Skills CLI (Vercel)**
```bash
npx skills add akillness/jeo-skills --skill git-workflow -a claude-code
```

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

### Codex

1. **Skills CLI (Vercel)**
```bash
npx skills add akillness/jeo-skills --skill git-workflow -a codex
```

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

### Cursor

1. **Skills CLI (Vercel)**
```bash
npx skills add akillness/jeo-skills --skill git-workflow -a cursor
```

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

### GitHub Copilot

1. **GitHub CLI**
```bash
gh skill install akillness/jeo-skills git-workflow
```

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

### Gemini CLI

1. **Skills CLI (Vercel)**
```bash
npx skills add akillness/jeo-skills --skill git-workflow -a gemini-cli
```

2. **Platform CLI**
```bash
gemini skills install https://github.com/akillness/jeo-skills --path .agent-skills/git-workflow
```

### Windsurf (Devin Desktop)

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

### OpenCode

**Skills CLI (Vercel)**
```bash
npx skills add akillness/jeo-skills --skill git-workflow -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/akillness/jeo-skills/tree/HEAD/.agent-skills/git-workflow/SKILL.md

## When to use it
- prepare a branch for review
- split changes into cleaner commits
- choose merge or rebase for a branch update
- resolve a local Git conflict
- recover a commit after reset or rebase

## Example prompts
- Inspect my branch and tell me the safest next step before review.
- I ran `reset --hard` by mistake; help me recover the missing commit.
- I rebased this branch; prepare a safe push for the rewritten history.

## Similar
- [spatie-version-control](https://affpapa.org/en/nevibecode/skills/spatie-version-control.md) — skill · 480 installs
- [git-workflow-and-versioning](https://affpapa.org/en/nevibecode/skills/git-workflow-and-versioning.md) — skill · 59500 installs
- [git-notes](https://affpapa.org/en/nevibecode/skills/git-notes.md) — skill · 1100 installs
- [here-be-git](https://affpapa.org/en/nevibecode/skills/here-be-git.md) — skill · 527 installs
- [git-rebase](https://affpapa.org/en/nevibecode/skills/git-rebase.md) — skill · 376 installs
- [git-workflow-strategy](https://affpapa.org/en/nevibecode/skills/git-workflow-strategy.md) — skill · 482 installs

## Other versions with the same name
- [git-workflow · affaan-m](https://affpapa.org/en/nevibecode/skills/git-workflow.md) — 5000 installs
- [git-workflow · agno-agi](https://affpapa.org/en/nevibecode/skills/agno-team-git-workflow.md) — 665 installs
- [git-workflow · ruvnet](https://affpapa.org/en/nevibecode/skills/ruvnet-git-workflow.md) — 743 installs
- [git-workflow · galaxy-dawn](https://affpapa.org/en/nevibecode/skills/galaxy-dawn-git-workflow.md) — 374 installs
- [git-workflow · jezweb](https://affpapa.org/en/nevibecode/skills/jezweb-git-workflow.md) — 1200 installs

From the same set: [akillness/jeo-skills](https://affpapa.org/en/nevibecode/by/akillness/jeo-skills.md) — 65 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