Finishing a Development Branch
obra/superpowers
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
Stops an agent from destroying uncommitted work with git. An agent skill from waynesutton/builder-skills.
Install Git Safety
$ npx skills add waynesutton/builder-skills --skill git-safety -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install waynesutton/builder-skills git-safety --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/waynesutton/builder-skills.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/git-safety .claude/skills/git-safety && rm -rf skills-srcUse ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.
Claude Code skills documentation · loads skills from .claude/skills/
Install the "git-safety" agent skill from https://github.com/waynesutton/builder-skills/tree/main/skills/git-safety into .claude/skills/git-safety/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-safety", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/waynesutton/builder-skills/tree/main/skills/git-safetyType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add waynesutton/builder-skills --skill git-safety -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install waynesutton/builder-skills git-safety --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/waynesutton/builder-skills.git skills-src && mkdir -p .agents/skills && cp -r skills-src/skills/git-safety .agents/skills/git-safety && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "git-safety" agent skill from https://github.com/waynesutton/builder-skills/tree/main/skills/git-safety into .agents/skills/git-safety/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-safety", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add waynesutton/builder-skills --skill git-safety -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install waynesutton/builder-skills git-safety --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/waynesutton/builder-skills.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/skills/git-safety .cursor/skills/git-safety && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "git-safety" agent skill from https://github.com/waynesutton/builder-skills/tree/main/skills/git-safety into .cursor/skills/git-safety/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-safety", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/waynesutton/builder-skills.git --path skills/git-safety--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add waynesutton/builder-skills --skill git-safety -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install waynesutton/builder-skills git-safety --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/waynesutton/builder-skills.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/skills/git-safety .gemini/skills/git-safety && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "git-safety" agent skill from https://github.com/waynesutton/builder-skills/tree/main/skills/git-safety into .gemini/skills/git-safety/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-safety", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install waynesutton/builder-skills git-safetyInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add waynesutton/builder-skills --skill git-safety -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/waynesutton/builder-skills.git skills-src && mkdir -p .github/skills && cp -r skills-src/skills/git-safety .github/skills/git-safety && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "git-safety" agent skill from https://github.com/waynesutton/builder-skills/tree/main/skills/git-safety into .github/skills/git-safety/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-safety", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add waynesutton/builder-skills --skill git-safety -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install waynesutton/builder-skills git-safety --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/waynesutton/builder-skills.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/skills/git-safety .opencode/skills/git-safety && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "git-safety" agent skill from https://github.com/waynesutton/builder-skills/tree/main/skills/git-safety into .opencode/skills/git-safety/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-safety", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Facts
- Skill name
git-safety- GitHub stars
- 404
- Token cost
- ~914 tokens
- SKILL.md length
- 522 words
- Files
- 4 (incl. assets)
- Skills in repo
- 17
- Repo updated
- First seen
- Licence
- Apache-2.0
At a glance
Stops an agent from destroying uncommitted work with git. An agent skill from waynesutton/builder-skills.
- Works in 3 steps: git status. Read it. → If anything is modified or untracked,… → Suggest git stash push -m "" if the user…
- A task involves reverting
- SKILL.md covers Before any git command, Commands that need explicit…, Revert and undo mean edit and Diff before discard, plus 3 more sections
- Calls git
What it does
Git Safety is an agent skill from waynesutton/builder-skills. Stops an agent from destroying uncommitted work with git. Requires git status and git diff before any command that discards changes, treats "revert" and "undo" as manual edits, and never runs reset, checkout, clean, stash drop, or force push without explicit approval. Use when a task involves reverting, undoing, resetting, cleaning, rebasing, or force pushing, or before any git command in a repo with uncommitted changes.
Its SKILL.md is about 910 tokens, which your agent loads only when the skill is triggered. The skill folder holds 5 other files, including assets (for example `agents/openai.yaml`).
It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: Builder skills for Convex apps. Convex patterns plus a PRD, task.md, changelog, and files.md workflow for Claude Code, Codex, Cursor, and OpenCode. The licence is Apache-2.0.
When your agent uses it
- A task involves reverting
- Before any git command in a repo with uncommitted changes
Example prompts
- “revert”
- “Use the git-safety skill to stop an agent from destroying uncommitted work with git. An agent skill from waynesutton/builder-skills”
- “/git-safety”
Workflow steps
3 steps, taken from the first numbered list in SKILL.md.
- git status. Read it.
- If anything is modified or untracked, stop. Say what is there. Ask before proceeding with anything that could touch those files.
- Suggest git stash push -m "" if the user needs a clean tree and wants the work kept.
What it can do on your machine
Read from SKILL.md and the folder at commit 82d1ce2. It shows what the files ask for, not the result of running them.
Tool permissions
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Runs code
Shell commands in SKILL.md call:
git
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Credentials
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Context cost
Git Safety loads about 914 tokens when it runs. Until then it costs about 109 tokens; SKILL.md has 522 words of instructions outside code blocks.
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
Safety
Auto-check passed
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
SKILL.md
The full file from waynesutton/builder-skills at commit 82d1ce2, republished under its Apache-2.0 licence (© waynesutton). 522 words, ~914 tokens.
Download SKILL.mdSave it as
.claude/skills/git-safety/SKILL.md (or your agent's skills folder). This skill also uses 3 other files; get the full folder from GitHub.- name
- git-safety
- description
- Stops an agent from destroying uncommitted work with git. Requires git status and git diff before any command that discards changes, treats "revert" and "undo" as manual edits, and never runs reset, checkout, clean, stash drop, or force push without explicit approval. Use when a task involves reverting, undoing, resetting, cleaning, rebasing, or force pushing, or before any git command in a repo with uncommitted changes.
Git safety
These rules exist because one git checkout -- . erased two days of work. Follow them every time, not only when it feels risky.
Before any git command
git status. Read it.- If anything is modified or untracked, stop. Say what is there. Ask before proceeding with anything that could touch those files.
- Suggest
git stash push -m "<why>"if the user needs a clean tree and wants the work kept.
Commands that need explicit approval
Never run these on your own. Show the exact command, say what it will destroy, and wait for a yes.
| Command | What it destroys |
|---|---|
git reset --hard | every uncommitted change |
git checkout -- <file> or git restore <file> | uncommitted changes in that file |
git checkout -- . or git restore . | uncommitted changes in every file |
git clean -fd | every untracked file and folder |
git stash drop or git stash clear | stashed work |
git push --force or --force-with-lease | remote history other people may have |
git branch -D | a branch and any commits only it holds |
git rebase on a shared branch | commit ids other people have |
"Explicit approval" means the user saw the command and said yes to it. A general "go ahead" from earlier in the conversation does not count.
Revert and undo mean edit
When the user says "revert that", "undo that", or "go back":
- Ask which change. Committed or uncommitted? All of it or one part?
git diff <file>to see exactly what would be lost.- Read the current file.
- Edit the file by hand to remove the specific lines that are wrong. Keep everything else.
- Show the result.
Do not reach for git checkout or git restore. They remove everything in the file, including the parts the user liked.
For committed changes, git revert <sha> is safe because it creates a new commit. Still show the sha and the commit message first.
Show full SKILL.md (206 more words)Show less
Diff before discard
Any time a change is about to be thrown away, the user sees git diff output for it first. No exceptions. If the diff is long, show git diff --stat and offer the full diff.
Commits, pushes, deploys
Do not commit, push, tag, publish, or deploy unless the user asks in the current message. When the work is done, print a suggested commit message and stop.
Suggested commit:
fix: dedupe heartbeat writes within 10s windowSafe defaults
These are fine to run without asking:
git status,git log,git diff,git show,git blamegit stash push -m "<message>"when the user asked for a clean treegit add <specific files>when the user asked to commitgit checkout -b <new-branch>from a clean treegit revert <sha>after showing the commit
Checklist
Before a git command:
-
git statusran and I read it - no uncommitted work is in the blast radius, or the user approved
- I showed
git difffor anything being discarded - the command is not in the approval table, or the user said yes to this exact command
When asked to revert or undo:
- I know which change and whether it is committed
- I am editing the file, not checking it out
- everything the user did not mention stays
© waynesutton, Apache-2.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
Files
SKILL.md and 3 other files (assets) in skills/git-safety of waynesutton/builder-skills.
- SKILL.md
- agents/openai.yaml
- assets/large-logo.png
- assets/small-logo.svg
Open the folder on GitHubat commit 82d1ce2
Compare with similar skills
Git Safety next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Git Safety this skillwaynesutton/builder-skills | 404 | — | ~914 | Automated safety check: Pass | Apache-2.0 | |
| Finishing a Development Branchobra/superpowers | 296k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Code Design Rationale Investigatorcursor/plugins | 10k | 9 repos | ~2.6k | Automated safety check: Pass | None | |
| Contributor-First PR MergeHKUDS/OpenHarness | 16k | 1 repos | ~847 | Automated safety check: Pass | MIT | |
| Migrate Internal Package into GhostTryGhost/Ghost | 55k | — | ~3.8k | Automated safety check: Pass | MIT | |
| Create Pull Requestcline/cline | 70k | 1 repos | ~1.6k | Automated safety check: Pass | Apache-2.0 |
Similar skills
- Official
Code Design Rationale Investigator
cursor/plugins
Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.
Contributor-First PR Merge
HKUDS/OpenHarness
Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.
Migrate Internal Package into Ghost
TryGhost/Ghost
Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.
Create Pull Request
cline/cline
Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.
Git Merge Conflict Resolver
tailcallhq/forgecode
Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.
More from waynesutton/builder-skills
All 17 skills in this repoConvex Agents
waynesutton/builder-skills
Builds AI agents on the Convex agent component: threads, messages, tools that call queries and mutations, streaming, RAG with vector search, and workflows for multi step jobs.
Convex Best Practices
waynesutton/builder-skills
Production patterns for Convex apps and the rules the @convex-dev/eslint-plugin enforces: validators, indexes, idempotent mutations, avoiding OCC conflicts, thin function wrappers, error handling.
Convex Component Authoring
waynesutton/builder-skills
Creates reusable Convex components with defineComponent, a clean client wrapper, their own schema, and an npm publish setup.
Convex Cron Jobs
waynesutton/builder-skills
Schedules work in Convex: cron jobs in convex/crons.ts, one off scheduled functions with runAfter and runAt, batching large jobs, and cancelling or inspecting the queue.
Convex HTTP Actions
waynesutton/builder-skills
Adds HTTP endpoints in convex/http.ts: webhook receivers with signature checks, REST style routes, CORS, auth headers, streaming responses, and file uploads over HTTP.
Convex Migrations
waynesutton/builder-skills
Changes a live Convex schema without downtime: make a field optional, backfill in batches, flip the validator, then clean up.
Related
Works with
Categories
Questions about Git Safety
What does Git Safety do?
Stops an agent from destroying uncommitted work with git. An agent skill from waynesutton/builder-skills. Git Safety is an agent skill from waynesutton/builder-skills. Stops an agent from destroying uncommitted work with git.
When should I use Git Safety?
Git Safety fits situations like: A task involves reverting; before any git command in a repo with uncommitted changes.
How do I install Git Safety in Claude Code?
Run `npx skills add waynesutton/builder-skills --skill git-safety -a claude-code`. Or copy the skill folder (skills/git-safety in waynesutton/builder-skills) into .claude/skills/git-safety in your project. Claude Code loads it when a task matches its description.
How do I install Git Safety in Codex?
Run `npx skills add waynesutton/builder-skills --skill git-safety -a codex`. Or copy the skill folder (skills/git-safety in waynesutton/builder-skills) into .agents/skills/git-safety in your project. Codex loads it when a task matches its description.
Can I use Git Safety in Cursor, Gemini CLI or GitHub Copilot?
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add waynesutton/builder-skills --skill git-safety -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/git-safety, .gemini/skills/git-safety, .github/skills/git-safety and .opencode/skills/git-safety in your project.
What does Git Safety need to run?
Going by SKILL.md and its folder, Git Safety needs the command-line tools its instructions call (git).
Does Git Safety access the network?
SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Is Git Safety safe to install?
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.
What licence does Git Safety use?
Git Safety is published under the Apache-2.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
How many tokens does Git Safety use?
About 914 tokens (SKILL.md is roughly 3.7k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
What are the alternatives to Git Safety?
Skills that share tags, products or a category with Git Safety: Finishing a Development Branch (obra/superpowers, 296k stars), Code Design Rationale Investigator (cursor/plugins, 10k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 55k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Git Safety?
waynesutton (a GitHub user) maintains it in waynesutton/builder-skills, which has 404 GitHub stars. The repository holds 17 skills in this directory. The repository was last updated on September 28, 2026.
Source: waynesutton/builder-skills on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.