This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: Experimental branches
- From: Cary Coutant <ccoutant at google dot com>
- To: "H.J. Lu" <hjl dot tools at gmail dot com>
- Cc: Joel Brobecker <brobecker at adacore dot com>, Binutils <binutils at sourceware dot org>, gdb-patches <gdb-patches at sourceware dot org>
- Date: Thu, 15 Jan 2015 15:04:38 -0800
- Subject: Re: Experimental branches
- Authentication-results: sourceware.org; auth=none
- References: <CAHACq4rzgyE-2cM=UV30-1MWKHsWqwF1QdtuAujgYzFJ=8Y08A at mail dot gmail dot com> <20141223132714 dot GA11973 at adacore dot com> <CAHACq4qPSC6YX_uAcT0n35QD61LxATcKhjG0BXQ-qRhQ+GU63A at mail dot gmail dot com> <CAMe9rOqGKgd2gF6FLEAO4JQuDzyQJ8DXw94eE3ckO=ZiEep+SA at mail dot gmail dot com> <20141223180802 dot GP12884 at adacore dot com> <CAHACq4ovTQCoTpXnnU1_Rpo7cR5gDwpYZkd17zfm2dwpWJNorA at mail dot gmail dot com> <CAMe9rOprFe_cqVPoz6Bd1Fh3GaBYkHyem+upZQFe=FRrQW3tfg at mail dot gmail dot com> <20141224002022 dot GQ12884 at adacore dot com> <CAHACq4pOQzXqhePkuvm_-b0dtHiwBCre2V_d3JbtotaPooN0zA at mail dot gmail dot com> <CAMe9rOofS9d8gUxa9gc07a7M=XvLF-Ps8+8o8g2O6mpPkLXJzg at mail dot gmail dot com>
>> On my experimental branch, I did "git merge master", then tried to
>> push. I got this:
>>
>> remote: *** This update introduces too many new commits (136), which would
>> remote: *** trigger as many emails, exceeding the current limit (100).
>> remote: *** Contact your repository adminstrator if you really meant
>> remote: *** to generate this many commit emails.
>> remote: error: hook declined to update
>> refs/heads/users/ccoutant/two-level-line-tables
>>
>> Clearly, I don't want to generate all those commit emails. What do I do instead?
>>
>
> Can you do a rebase first?
But I've already pushed several commits onto the upstream branch.
Everything I've read about git says don't rebase if you've already
pushed your branch upstream.
-cary