Hi Mikkel, On Fri, Sep 14, 2018 at 02:31:04PM +0200, Mikkel Hofstedt Juul wrote: > See title > in sentence: > ...invocations of git add, packing refs, pruning reflog, rerere > metadata or stale working trees. I think that 'rerere' in this case, is correct, since it refers bookkeeping from the 'git rerere' command [1], which "reuse[s] recorded resolution[s] of conflict meregs". Thanks, Taylor [1]: https://git-scm.com/docs/git-rerere