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

[Hubert Tong via cfe-dev]

On Tue, Jan 29, 2019 at 10:31 PM Bruce Hoult via llvm-dev <
llvm-dev at lists.llvm.org> wrote:

> How about:
>
> Require a rebase, followed by git merge --no-ff
>
For personal use, I like this the most. Unfortunately, I think this is more
of a command-line workflow that the GitHub UI is not friendly with.
In particular, the UI has roughly: merge (creates yet another merge
commit), squash, and rebase. All of these prevent the intended result.


>
> 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
> _______________________________________________
> LLVM Developers mailing list
> llvm-dev at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-dev/attachments/20190129/80cef541/attachment.html>