I've had to deal with reconciling a divergent tree; I've seen code that does not appear in `git show x` for any x in `show show --full-history`, and discovered that `git show XXXX` is different from `git diff XXXX^..XXXX`. I'm sure a fanboy will be along to tell me that a commit is just a monoid in the category of endofunctors and I just need to run `git-vent-branch --relieve-mimic-subtree --stub-indict-file`, but I'd rather not.