git-revert

Goal

Undo the effect of commit(s) with git revert — create a new inverse commit instead of rewriting history, safe for commits already pushed

revert a single commit, a range of commits, or a merge commit
use when a pushed change must be undone — if not yet pushed and the commit should really be removed → consider /restore-files or reset (requires confirmation)
does not cover undoing uncommitted changes — use /git-restore instead

Goal: clearly identify the commit(s) to revert

if the user gives a sha/range → use it directly; otherwise → run /check-git-logs to find the target commit
review the content with git show <sha> — confirm it is really the change to undo
check whether the commit is a merge commit (look at the Merge: header in git show) and whether later commits touched the same files (conflict risk)

Goal: know the outcome before writing the new commit

git revert --no-commit <sha> then git diff --cached to see the inverse change
if it conflicts → git revert --abort, then re-plan or resolve per step 3
git reset to clear the staged state after previewing (if not ready to commit)

Goal: create a correct inverse commit

single commit: git revert <sha> — auto-generated message, editable to match the project's conventional commits
range: git revert <oldest>^..<newest> or --no-commit one by one then a single squashed message if it is one change set
merge commit: git revert -m 1 <merge-sha> (parent 1 = mainline) — specify the mainline correctly, never guess
if it conflicts: fix the files, git add, git revert --continue — git revert --abort always works to cancel

Goal: the working tree is back to the state before that commit and the build passes

git show HEAD to check the inverse diff; compare the tree with git diff <sha>^ HEAD if this was the latest revert
run /run-check — a revert can break build/tests (later commits may depend on the reverted code)
report via /report: reverted commits, conflicts, files touched

never git reset/rebase to undo commits already pushed — always use revert (history is public)
merge commits need -m 1 (or the correct parent) — never revert a merge without specifying the parent
reverting several consecutive commits → revert newest to oldest to reduce conflicts
if the revert breaks tests/build → run /resolve-errors — never commit a revert that silently breaks main
revert of a revert = re-apply — if the change should come back, revert the revert commit, do not re-cherry-pick the original
Use /resolve-errors if needed