Checkpoints And Rewind — Claude Code Guide

A checkpoint is not a Git commit

A checkpoint saves a point inside a Claude session, while `/rewind` returns work to an earlier dialogue state or session branch. It is not a universal equivalent of a Git commit.

A Git commit, push, database migration, external service call, or deployment cannot be undone through `/rewind`. Such effects need a separate rollback procedure.

Prepare a checkpoint

1. Check that the baseline tests pass.
2. Record the baseline in Git or by another reproducible method.
3. Describe the current milestone and its scope.
4. Make sure the list of allowed files is clear.
5. Save a checkpoint before a risky experiment.

/rewind

/help

# Check the current command syntax in your version.

What to do after an unwanted direction

1. Stop further edits.
2. Check whether a commit or external effect was created.
3. Assess the diff and file state.
4. Run /rewind if the problem belongs to session work.
5. Narrow the prompt and ask for a minimal plan first.
6. Recheck the files and tests before continuing.

Limits of `/rewind`

• Manual changes in an IDE may not belong to the Claude session state.
• A Git commit requires git revert or another Git procedure.
• A database migration requires a reverse migration or restoration from a backup.
• An external request or deployment is not automatically canceled.
• A new session may be better if the problem is already in overloaded context.

After a rewind

A checkpoint is useful together with a Git baseline, small steps, diff review, and tests. Do not treat a rewind as permission to continue without analyzing the cause of the failed iteration.