How to Use Checkpoints in Claude Code

Claude Code v2.0.0 introduced the /rewind command, a built-in checkpoint system that allows you to restore code and conversation to previous states without relying on git. This integrated solution provides instant rollback for both professional developers and vibe coders who may be unfamiliar with version control systems.

---

Power up with parallel agents (ad)

Run multiple autonomous coding agents simultaneously with Verdent Deck's isolated Git worktrees. Each agent tackles different components while maintaining full context awareness, eliminating manual debugging bottlenecks and accelerating feature delivery. Discover Verdent AI (Free Trial)

---

How to Use It

Run the /rewind command during any Claude Code session to open the checkpoint interface:

/rewind

Each checkpoint entry displays three key pieces of information:

• User prompt - The original request that triggered the changes
• Affected files - Which files were modified at that checkpoint
• Line count diffs - Change summary showing +additions -deletions

Checkpoint Workflow

Use checkpoints strategically for safe experimentation and recovery:

Checkpoint Strategy:

1. Run /rewind to view available restore points
2. Review the list of changes with file diffs
3. Select the checkpoint to restore to
4. Confirm with restoration mode selection:
   • Restore code and conversation - Complete rollback of both states
   • Restore conversation - Revert conversation without changing code
   • Restore code - Revert code without affecting conversation
5. The conversation forks at the selected checkpoint

The separation between code state and context state provides precise control over what gets restored. When you select a checkpoint, the UI shows the original message and timestamp, indicating whether code or conversation has changed since that point.

Important: Rewinding does not affect files edited manually or via bash commands. It only restores changes made by Claude Code during the session.

Built-in Version Control

The checkpoint system operates independently of git, making it accessible to all users regardless of version control experience. Professional developers benefit from instant session-level rollback without git overhead, while vibe coders get safety nets without learning git commands.

Benefits of Integrated Checkpoints:

• No Git Required - Works immediately without repository initialization or git knowledge
• Session-Level Rollback - Undo changes within your Claude Code session instantly
• Lower Barrier - Vibe coders experiment safely without version control complexity
• Complementary Tool - Professional developers use checkpoints for rapid iteration alongside git for commits
• Automatic Tracking - Every change creates a checkpoint without manual intervention

The /rewind command allows me to experiment more safely with Claude Code. Previously, I continuously staged or made git commits before asking Claude to perform tasks that might lead to hallucinations or errors. Checkpoints eliminate this friction by providing instant rollback without git overhead, enabling fearless experimentation during active development sessions.

Safe Experimentation

/rewind creates automatic checkpoints throughout your session for instant rollback. Experiment freely with aggressive changes knowing you can restore any previous state.

Power up with parallel agents (ad)

Run multiple autonomous coding agents simultaneously with Verdent Deck's isolated Git worktrees. Each agent tackles different components while maintaining full context awareness, eliminating manual debugging bottlenecks and accelerating feature delivery. Discover Verdent AI (Free Trial)

---

See Also: Session Management|Terminal Controls|How to Suspend Claude Code