Re: [git pull] drm-next
www.mail-archive.com

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.

  • FizzyOrange@programming.dev
    0·
    14 days ago

    The only rule you need is: preserve history that is worth preserving.

    99% of the time, that means you should squash commits in a PR. Most commits should be small enough that they don’t need more fine grained history than one commit.

    I will grant a couple of exceptions:

    1. Sometimes you have refactorings where you e.g. move a load of files and then do something else… Or do a big search and replace and then fix the errors. In these cases it’s nice to have the file moves or search/replace in separate commits to a) make review easier, b) make the significant changes easier to see, and c) let git track file moves reliably.
    2. Sometimes you have a very long lived feature branch that multiple people have worked on for months. That can be worth keeping history for.

    Unfortunately, if you enable merge queues on GitHub it forces you to pick one method for all PRs, which is kind of dumb. We just use squash merges for everything and accept that sometimes it’s not the best.