On: Git from the Bottom Up (2009) [pdf]

[userbinator]

Talking about merges in Git always reminds me of this Linus post:

http://marc.info/?l=linux-kernel&m=139033182525831

there's clearly a balance between "octopus merges are fine" and "Christ, that's not an octopus, that's a Cthulhu merge".

(Also, GitHub's logo is reminiscent of the "octopus merge".)