4 ms·

There is a mention of the 66 parent merge from Linus himself: http://marc.info/?l=linux-kernel&m=139033182525831 http://marc.info/?l=linux-kernel&m=13903318252

• gary_bernhardt 10y ago
  Whoa, you're right! He referenced it neither by 7-character short hash nor by full hash, and I didn't think to check intermediate hash lengths. I've updated the post to reference that email.
  • auscompgeek 10y ago
    The kernel devs recommend using 12-character commit hash abbreviations: https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-your-changes https://www.kernel.org/doc/html/latest/process/submitting-pa... (bottom of the section has a git config snippet)
• semi-extrinsic 10y ago
  > "Christ, that's not an octopus, that's a Cthulhu merge"
  • bigiain 10y ago
    Related - from Twitter recently: https://twitter.com/HenryHoffman/status/694184106440200192/photo/1 https://twitter.com/HenryHoffman/status/694184106440200192/p...
  • digi_owl 10y ago
    Never change, Torvalds, never change.
• wcummings 10y ago
  >Anyway, I'd suggest you try to limit octopus merges to ~15 parents or less to make the visualization tools not go crazy. Maybe aim for just 10 or so in most cases. I'll file this under "problems I'm glad I don't have".