On Tue, Jun 25, 2024 at 12:03 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > These, we definitely do not want them [*]. > * We do not want the squashed CBA!!! revert or ABC reapply, both of > which are large balls of wax that interferes with bisectability. > So if you want to avoid "we can forget that we have reverted" > problem, not reverting the revert, but rebuilding the entire chain, > is a better approach that gives you cleanest history to work with, > and that is what we already offer as an alternative of "reverting a > revert", not "squashed revert and squashed reapply on the side > branch". If you don't mind rebasing the branch, what you're suggesting is fine. However, if it's a long-running branch, with multiple people working on it, rebasing is not an option. In that case, I think that my suggestion makes a lot of sense. A good idea would be to add the "large balls of wax" commits to a `.git-blame-ignore-revs` (or whatever you choose to call it) file. Cheers, Noam
