rollback

Rollback

Available Checkpoints

Stash Checkpoints

!git stash list 2>/dev/null | grep "checkpoint:" || echo "No stash checkpoints"

Tag Checkpoints

!git tag -l "checkpoint/*" 2>/dev/null || echo "No tag checkpoints"

Recent Commits

!git log --oneline -10 2>/dev/null

---

Rollback Target

Target: $ARGUMENTS

---

Rollback Protocol

1. Identify Target

If numeric (e.g., 3): Rollback 3 commits

git reset --soft HEAD~3

If checkpoint name (e.g., pre-refactor): Find in stash or tags

# Check stash
git stash list | grep "checkpoint:$NAME"

# Check tags
git tag -l "checkpoint/$NAME"

2. Safety Checks

Before rollback:

• Current work saved? (stash or commit)
• Not on protected branch?
• Understand what will be lost?

# Show what will be affected
git log --oneline HEAD~$N..HEAD  # For numeric
git diff checkpoint/$NAME HEAD   # For named

3. Execute Rollback

From Stash Checkpoint:

git stash apply stash@{N}  # Where N is stash index
# or
git stash pop stash@{N}    # Apply and remove

From Tag Checkpoint:

# Soft rollback (keep changes)
git reset --soft checkpoint/$NAME

# Hard rollback (discard changes)
git checkout checkpoint/$NAME
git checkout -b restored-from-$NAME

From Commit Count:

# Soft (keep changes staged)
git reset --soft HEAD~$N

# Mixed (keep changes unstaged)
git reset HEAD~$N

# Hard (discard changes) ⚠️
git reset --hard HEAD~$N

4. Rollback Options

Option	Command	Keeps Changes	Use When
Soft	--soft	Staged	Review before discard
Mixed	(default)	Unstaged	Selective re-commit
Hard	--hard	No	Full revert

5. Report

↩️ Rollback Complete

Target: [checkpoint/commit]
Method: [soft/mixed/hard]
Commits undone: [N]
Files affected: [count]

Current state: [branch and status]

To undo rollback: git reflog

6. Post-Rollback