NAME git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS git rerere [clear | forget ... | diffdefault is 60 days. See git-rerere (1). gc.rerereUnresolved Records of conflicted merge you have ... default is 15 days. See git-rerere (1). NOTES git gc tries very hardwithout touching index or working tree. git-rerere (1) Reuse recorded resolution of conflicted merges