From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28054 invoked by alias); 15 Jan 2015 23:04:43 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 28033 invoked by uid 89); 15 Jan 2015 23:04:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mail-ig0-f171.google.com Received: from mail-ig0-f171.google.com (HELO mail-ig0-f171.google.com) (209.85.213.171) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 15 Jan 2015 23:04:41 +0000 Received: by mail-ig0-f171.google.com with SMTP id z20so595760igj.4 for ; Thu, 15 Jan 2015 15:04:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=ZBjGSr84fculBU3eCRJHGOXFaBruqZgSeDj5ZmqNU8w=; b=a0hxUlP6nlBYj9LS5CMtl0IfSaJW/z2DR4U3W1nk7WvGeYmmZmRqu43mVdnF7CCf96 qWqMtBqvypuhBZAr8NC6RZrsEDIoNrh3GQSlIU5UUeVTay35bhtw0xkRWH+jH9Ry2f9y R7A3vfB3Jh8rz4ciwNyqxKJiRKDdNx/0fHs/ummQrxtAqf0Qvmg9aHke/90WC27sIOXF UqUzcXldnge+g/jRwhSoPs7eTehR5qcGgv6HCjYpGN9Rcekfvc8nRWABE8e1qKPooty8 mnqa5g30KB2xkFQWXkNXNreI92WvN7Ux9udW3kB1NKzzsvma25Eo0cifQfCWzTPgAo4y yeTQ== X-Gm-Message-State: ALoCoQlgUo1D78xyE/AE5jHt8oI7Q9+hmNHpTC453YgKmC2Ug8qEGgB7qDf6w/jJryt7VGKyjkW1 MIME-Version: 1.0 X-Received: by 10.50.28.82 with SMTP id z18mr416663igg.15.1421363079038; Thu, 15 Jan 2015 15:04:39 -0800 (PST) Received: by 10.107.25.146 with HTTP; Thu, 15 Jan 2015 15:04:38 -0800 (PST) In-Reply-To: References: <20141223132714.GA11973@adacore.com> <20141223180802.GP12884@adacore.com> <20141224002022.GQ12884@adacore.com> Date: Thu, 15 Jan 2015 23:04:00 -0000 Message-ID: Subject: Re: Experimental branches From: Cary Coutant To: "H.J. Lu" Cc: Joel Brobecker , Binutils , gdb-patches Content-Type: text/plain; charset=UTF-8 X-IsSubscribed: yes X-SW-Source: 2015-01/txt/msg00439.txt.bz2 >> 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