I want clean history, but that really means (a) clean and (b) history.
People can (and probably should) rebase their private trees (their own work). That’s a cleanup. But never other peoples code. That’s a “destroy history”
So the history part is fairly easy. There’s only one major rule, and one minor clarification:
- You must never EVER destroy other peoples history. You must not rebase commits other people did.
[…]
If you are working with git together with other people, it’s worth a read.
Not really because I’ve never seen a setup that requires every commit in a branch to compile and pass tests. Only the merge commit needs to.
Also if your PR is so big that it would be painful to bisect within it, then it should be broken into smaller PRs.