search for: git_merge_noff_option

...lvm.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/git_merge_noff_option/ 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

...wed 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/git_merge_noff_option/ > > > > 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. > > > > Agreed. Let's go with option #1. > > What is the practical plan to enforce the lack of merges? When...

Hi, As part of the migration of LLVM's source code to github, we need to update our developer policy with instructions about how to interact with the new git repository. There are a lot of different topics we will need to discuss, but I would like to start by initiating a discussion about our merge commit policy. Should we: 1. Disallow merge commits and enforce a linear history by