Migrating this from #27. `rerere` should be mentioned briefly somewhere in Chapter 5, and link over to Chapter 6. This was discussed in https://github.com/schacon/progit2/pull/1#discussion_r8747311.