3 ms·
git-rerere – Reuse recorded resolution of conflicted merges
- abound 3y agoI came across this in GitHub's squash docs [1] and had never heard of it before. In more ways than one, it reminded me of the fake git man page generator [2], but I guess that's part of why the fake man page generator is so entertaining. [1] https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github#squashing-your-merge-commits https://docs.github.com/en/repositories/configuring-branches... [2] https://git-man-page-generator.lokaltog.net https://git-man-page-generator.lokaltog.net