agentleFS
laz3rjenkinslaz3rjenkins/atomic-commits/skills/undo/SKILL.md

undo

Skill0 starsChanged 52 days agoMITView on GitHub

Undo the last N local commits and keep their changes, so you can re-commit them differently. Commits that were already pushed get a revert commit instead of a history rewrite.

7 other projects use a version of this.

Adopted by

Most recently taken up by

The file

We split this skill into the rules it gives an agent

2 rules. 0 are common, 0 are distinctive, and 2 are very specific to this project.

  • 0

    Common

    Most of the 4 edited versions we read keep these.

  • 0

    Distinctive

    This author's own choices. Worth a look.

  • 2

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  1. Very specific:

    Not pushed: run git reset --soft HEAD~<N>.

    line 19
  2. Very specific:

    Already pushed: don't rewrite history other people may have pulled.

    line 21

“Common” is measured: kept by at least 6 in 10 of the 4 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

Undo commits

N is the number from the arguments. It defaults to 1.

  1. Show what will be undone: git log --oneline -n <N>. If any of those commits is a merge commit, stop and ask the user. Undoing merges needs a deliberate decision.
  2. Check whether the commits were pushed.
    • With an upstream: git rev-list --count @{u}..HEAD is the number of unpushed commits. If it's smaller than N, some of the commits are already on the remote.
    • Without an upstream: check git branch -r --contains HEAD~<N-1>. Any output means the commit is on a remote.
  3. Not pushed: run git reset --soft HEAD~<N>. The changes stay in the working tree and the index; nothing is lost. If this would undo the very first commit in the repo, HEAD~<N> doesn't exist. Run git update-ref -d HEAD instead, which has the same effect.
  4. Already pushed: don't rewrite history other people may have pulled. Explain this, and offer git revert --no-edit <commits>, which adds new commits that reverse the old ones. Run it only after the user agrees.
  5. Report which commits were undone, and that their changes are now uncommitted. Mention that /commit groups them again.

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.