[cfe-dev] [llvm-dev] [Github] RFC: linear history vs merge commits

Bruce Hoult via cfe-dev cfe-dev at lists.llvm.org
Tue Jan 29 19:31:26 PST 2019


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/

On Tue, Jan 29, 2019 at 2:33 PM Tom Stellard via llvm-dev
<llvm-dev at lists.llvm.org> wrote:
>
> 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 requiring a
>    rebase before push.
>
> 2. Allow merge commits.
>
> 3. Require merge commits and disallow rebase before push.
>
> I'm going to propose that if we cannot reach a consensus that we
> adopt policy #1, because this is essentially what we have now
> with SVN.
>
> What does everyone think?
>
> Thanks,
> Tom
> _______________________________________________
> LLVM Developers mailing list
> llvm-dev at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev


More information about the cfe-dev mailing list