GIT-RERERE(1) GIT-RERERE(1) (NAME) git-rerere - (SYNOPSIS) git rerere [clear | forget ... | diff | status | remaining | gc] (DESCRIPTION) ( <<>> ) . . rerere.enabled . (COMMANDS) git rerere . . clear rerere . git am [--skip|--abort] git rebase [--skip|--abort] . forget rerere . diff . . diff PATH . status rerere . remaining rerere . rerere . gc . . gc.rerereUnresolved gc.rerereResolved . (DISCUSSION) (topic) master ( ) master : o---*---o topic / o---o---o---*---o---o master master topic . (pull) master : $ git switch topic $ git merge master o---*---o---+ topic / / o---o---o---*---o---o master * + . master . . + master (pull ) . master + : $ git switch topic $ git merge master $ ... work on both topic and master branches $ git switch master $ git merge topic o---*---o---+---o---o topic / / \ o---o---o---*---o---o---o---o---+ master <> . << >> . : $ git switch topic $ git merge master $ git reset --hard HEAD^ ;# rewind the test merge $ ... work on both topic and master branches $ git switch master $ git merge topic o---*---o-------o---o topic / \ o---o---o---*---o---o---o---o---+ master master . * . . git rerere . git rerere <<<<<<< ======= >>>>>>> . git rerere . master . git rerere (three-way merge) . . git rerere (index) git diff ( git diff -c) git add . git merge git rerere git rerere . git commit git rerere . ( rerere.enabled). master topic . git rerere git rebase . : o---*---o-------o---o topic / o---o---o---*---o---o---o---o master $ git rebase master topic o---*---o-------o---o topic / o---o---o---*---o---o---o---o master git rebase master topic . . git rerere git rebase . [] git rerere . git rerere . conflict-marker-size gitattributes(5) . (SEE ALSO) gitattributes(5), git-merge(1), git-rebase(1) (GIT) git(1) Git 2.55.0 2026-06-29 GIT-RERERE(1)