3 ms·
Maybe linus' fix should have been added as separate commit to a branch instead of putting the fix in the merge commit itself? Then the entire branch could be ta
by the8472 7y ago
Maybe linus' fix should have been added as separate commit to a branch instead of putting the fix in the merge commit itself? Then the entire branch could be taken and rebased, or at least the range cherry-picked.
- 0x0 7y agoThat's what I was thinking too. Extra diff changes in a merge commit is often hard to notice
- stonesixone 7y agoIndeed, this is called an "evil merge" [1], and here's [2] even an email with Linus mentioning it. I'm surprised the blog post doesn't mention evil merges by name, as this seems to be a prime example of why they're called evil. [1]: https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefevilmergeaevilmerge https://git-scm.com/docs/gitglossary#Documentation/gitglossa... [2]: https://www.mail-archive.com/git@vger.kernel.org/msg73938.html https://www.mail-archive.com/git@vger.kernel.org/msg73938.ht...