Show rerere diff

bash

git rerere diff

Explanation

Useful when verifying that rerere recorded the intended resolution.

Learn the surrounding workflow

Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.

Same sheet · prioritizing Rerere and Repeated Conflict Resolution

Record and reuse conflict resolutions automatically.

Open In sheetbashsame section

Remove recorded conflict-resolution data.

Open In sheetbashsame section

Save tracked changes with a message.

Open In sheetbash1 tag match

Show all linked working trees for the repository.

Open In sheetbash1 tag match

Dry-run a cleanup of untracked files.

Open In sheetbash1 tag match

Keep staged changes in the index and stash the rest.

Open In sheetbash1 tag match