This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Please do not commit merge commits to master.
- From: Carlos O'Donell <carlos at redhat dot com>
- To: Thorsten Kukuk <kukuk at suse dot de>, GNU C Library <libc-alpha at sourceware dot org>
- Date: Tue, 21 Mar 2017 11:59:08 -0400
- Subject: Please do not commit merge commits to master.
- Authentication-results: sourceware.org; auth=none
- References: <20170321154728.121151.qmail@sourceware.org>
On 03/21/2017 11:47 AM, kukuk@sourceware.org wrote:
> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "GNU C Library master sources".
>
> The branch, master has been updated
> via 261d0141b3b563b9105ab2aaeda9fa15a4990da5 (commit)
> via 1e4d83f6fe38613e6f209ff09dfad8e69a6e1629 (commit)
> from e4e26210c3bdb5dcdce7a3def3b90fa45d3e2c89 (commit)
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
>
> - Log -----------------------------------------------------------------
> http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=261d0141b3b563b9105ab2aaeda9fa15a4990da5
>
> commit 261d0141b3b563b9105ab2aaeda9fa15a4990da5
> Merge: 1e4d83f e4e2621
> Author: Thorsten Kukuk <kukuk@thkukuk.de>
> Date: Tue Mar 21 16:47:00 2017 +0100
>
> Merge branch 'master' of ssh://sourceware.org/git/glibc
>
> Conflicts:
> ChangeLog
My apologies for not making this clear.
Please do not commit merge commits to master.
You should rebase your commits on top of master and push them.
I'll see about getting a pre-update hook that rejects this.
--
Cheers,
Carlos.