This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Merge commits to master?
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: libc-alpha at sourceware dot org
- Date: Tue, 31 May 2016 11:40:35 -0300
- Subject: Re: Merge commits to master?
- Authentication-results: sourceware.org; auth=none
- References: <bug-19653-131 at http dot sourceware dot org/bugzilla/> <bug-19653-131-2n21YgNOot at http dot sourceware dot org/bugzilla/> <574DA130 dot 2070505 at redhat dot com>
On 31/05/2016 11:35, Carlos O'Donell wrote:
> On 05/30/2016 06:34 PM, cvs-commit at gcc dot gnu.org wrote:
>> - Log -----------------------------------------------------------------
>> https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7838d298d895f65247fb6b498db03a4336fc0506
>>
>> commit 7838d298d895f65247fb6b498db03a4336fc0506
>> Merge: ca7e8dd 600c13b
>> Author: Paul Pluzhnikov <ppluzhnikov@google.com>
>> Date: Mon May 30 15:33:13 2016 -0700
>>
>> Merge branch 'master' of ssh://sourceware.org/git/glibc
>
> Paul,
>
> Is there any reason you did a merge?
>
> It is popular in Linux to do merges because of the highly distributed
> nature of the branches and workflow. I don't know that we will ever
> need that level of complexity in upstream glibc.
>
> Should we be avoiding such merges and more simply commit fixes as
> commits which land on master?
I would prefer it, we do not have such load of commits and I think
a full commit message as we are aiming recently is better to document
the devel history.
>
> Cheers,
> Carlos.
>