From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10681 invoked by alias); 16 Jan 2015 19:26:23 -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 10660 invoked by uid 89); 16 Jan 2015 19:26:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-we0-f175.google.com Received: from mail-we0-f175.google.com (HELO mail-we0-f175.google.com) (74.125.82.175) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 16 Jan 2015 19:26:21 +0000 Received: by mail-we0-f175.google.com with SMTP id k11so21935926wes.6; Fri, 16 Jan 2015 11:26:18 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.194.190.46 with SMTP id gn14mr32774444wjc.36.1421436377974; Fri, 16 Jan 2015 11:26:17 -0800 (PST) Received: by 10.27.39.198 with HTTP; Fri, 16 Jan 2015 11:26:17 -0800 (PST) In-Reply-To: References: <20141223132714.GA11973@adacore.com> <20141223180802.GP12884@adacore.com> <20141224002022.GQ12884@adacore.com> <54B95B3B.6010901@redhat.com> Date: Fri, 16 Jan 2015 19:26:00 -0000 Message-ID: Subject: Re: Experimental branches From: Doug Evans To: Cary Coutant Cc: Richard Henderson , "H.J. Lu" , Joel Brobecker , Binutils , gdb-patches Content-Type: text/plain; charset=UTF-8 X-IsSubscribed: yes X-SW-Source: 2015-01/txt/msg00482.txt.bz2 On Fri, Jan 16, 2015 at 11:07 AM, Cary Coutant wrote: >>> 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. >> >> That's if you've actually got multiple developers coordinating. >> >> For solo development on branches, rebasing minimizes the state >> difference between trunk and the branch, and so is quite handy >> (essential?) for preparing to submit a patch set for review. > > Yes. I already had a collaborator pull from my branch, and I didn't > want to disrupt him. Don't worry about me! :-) I know git well enough now to cope. [Which isn't to dismiss your point, which is valid, but if it's just me ...]