[llvm-dev] [Github] RFC: linear history vs merge commits (original) (raw)

David Greene via llvm-dev llvm-dev at lists.llvm.org
Wed Jan 30 12:42:01 PST 2019

Bruce Hoult via llvm-dev <llvm-dev at lists.llvm.org> writes:

How about:

Require a rebase, followed by git merge --no-ff This creates a linear history, but with extra null merge commits delimiting each related series of patches. I believe it is compatible with bisect. https://linuxhint.com/gitmergenoffoption/

We've done both and I personally prefer the strict linear history by a lot. It's just much easier to understand a linear history.

                  -David

More information about the llvm-dev mailing list