3 ms·

I chuckled a bit when their git-sizer tool pointed out a high level of concern for the 66 parent octopus merge in the Linux kernel. See https://www.destroyalls

I chuckled a bit when their git-sizer tool pointed out a high level of concern for the 66 parent octopus merge in the Linux kernel. See https://www.destroyallsoftware.com/blog/2017/the-biggest-and-weirdest-commits-in-linux-kernel-git-history https://www.destroyallsoftware.com/blog/2017/the-biggest-and... for the story behind the Cthulhu commit.

LukeShu 9y ago
From the article: > Update: it was [an accident][1], which Linus responded to in his usual fashion. > [1]: http://lkml.iu.edu/hypermail/linux/kernel/1603.2/01926.html http://lkml.iu.edu/hypermail/linux/kernel/1603.2/01926.html Those who only know Linus from his rants might be surprised that here "his usual fashion" means: - Acknowledging that the root cause was Github's documentation being misleading. - Not blaming the contributor for being mislead by Github: "I can see why that documentation would make you think it's the right thing to do." - Admit that the ease with which the accident happened is a deficiency in Git's UI. - CC the Git maintainer to discuss improving Git to make it harder to do this by accident. (Which eventually lead to the --allow-unrelated-histories flag being needed to do this kind of merge.)