Index of every page on this site: llms.txt
All skills
waynesutton avatar

/git-safety

@853b196
Run it yourself

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.

Use this Skill: https://skilld.dev/gh/waynesutton/builder-skills/git-safety

Nothing lands on disk. Nothing to clean up.

Fork this Skill

Edit a local copy. It keeps the author and licence.

SKILL.md

≈109 tokens for metadata: the name and description. ≈798 when used: this file. ≈23 more on demand in 1 file.

Description uses 5.5% of example budget

Before choosing a Skill, your Agent reads its name and description. All available Skills share that space.

  • A shorter description leaves more room for other Skills. This entry exceeds our 1% size suggestion.

In our Claude Code example, all Skill names and descriptions share 8,000 characters. This Skill uses ≈437 characters, or 5.5%.

The 1% threshold is a size suggestion. Longer descriptions can still fit.

Your model, settings, and other Skills decide how much text your Agent can read.

Example settings and source

The example uses a 200k-token context and default Claude Code settings. The count includes the name, description, separators, and when_to_use when present. Codex also counts local file paths.

Skit's source and limits: Codex 0.160.1, Claude Code 2.1.292.

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

  1. git status. Read it.
  2. If anything is modified or untracked, stop. Say what is there. Ask before proceeding with anything that could touch those files.
  3. 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":

  1. Ask which change. Committed or uncommitted? All of it or one part?
  2. git diff <file> to see exactly what would be lost.
  3. Read the current file.
  4. Edit the file by hand to remove the specific lines that are wrong. Keep everything else.
  5. 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.

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 window

Safe defaults

These are fine to run without asking:

  • git status, git log, git diff, git show, git blame
  • git stash push -m "<message>" when the user asked for a clean tree
  • git add <specific files> when the user asked to commit
  • git checkout -b <new-branch> from a clean tree
  • git revert <sha> after showing the commit

Checklist

Before a git command:

  • git status ran and I read it
  • no uncommitted work is in the blast radius, or the user approved
  • I showed git diff for 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

Source: SKILL.md on GitHub

No rule matched.

skilld matched fixed text patterns in SKILL.md and file names. Patterns miss obfuscated code.

skilld run checks every file with the same patterns. It asks for approval before it loads a Skill with a behavior marked Needs approval.

No alerts1mo3 checks · Risk SAFE
  • Gen Agent Trust Hub1mo

    The skill establishes safety protocols for git operations, requiring status checks and explicit user approval before destructive actions like resetting or force pushing. No security vulnerabilities or malicious patterns were detected.

  • Socket1mo

    No alerts

  • Snyk1mo

    Risk: LOW · No issues

Signed by skilld at 853b196. This ties the file your Agent reads to that commit on GitHub. It does not review the instructions.

Last checked against GitHub 6 days ago.

Activeupdated 2 months ago

README badge

README badge for waynesutton/builder-skills/git-safety