undo

Undo Last Change

Current State

!git log -3 --oneline 2>/dev/null || echo "Not a git repo" !git status --short 2>/dev/null

Last Commit Details

!git log -1 --format="Author: %an%nMessage: %s%nDate: %ar" 2>/dev/null

---

Undo Protocol

1. Identify What to Undo

Check if last commit was made by Claude Boris:

LAST_AUTHOR=$(git log -1 --format="%an")
LAST_MSG=$(git log -1 --format="%s")

# Check for Claude markers
if echo "$LAST_MSG" | grep -qiE "claude|🤖|Generated by"; then
  echo "✅ Last commit was by Claude Boris - safe to undo"
else
  echo "⚠️ Last commit was NOT by Claude Boris"
  echo "Manual confirmation required"
fi

2. Undo Options

Option A: Undo Last Commit (keep changes staged)

git reset --soft HEAD^

Result: Commit removed, changes remain staged

Option B: Undo Last Commit (unstage changes)

git reset HEAD^

Result: Commit removed, changes remain in working directory

Option C: Undo Last Commit (discard changes)

git reset --hard HEAD^

⚠️ DESTRUCTIVE: Changes are lost

Option D: Undo Multiple Commits

git reset --soft HEAD~N  # Where N is number of commits

3. Execute Undo

Based on the analysis:

If last commit was by Claude Boris:

• Default to --soft reset (safest)
• Keep changes for review
• Report what was undone

If last commit was NOT by Claude:

• Warn user
• Require explicit confirmation
• Suggest alternative approaches

4. Report

↩️ Undo Complete

Reverted: [commit message]
SHA: [commit SHA]
Files affected: [count]

Changes are now: [staged/unstaged/discarded]

To restore: git reflog
To continue: make desired changes and commit

5. Safety Checks

Before undoing:

• Verify commit is by Claude
• Check for pushed commits (warn if pushed)
• Offer to create backup stash
• Log undo operation in audit log

Undo History

Track undos for reference:

echo "$(date +%Y-%m-%d_%H:%M:%S) UNDO $(git log -1 --format='%h %s')" >> .claude/undo.log