From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18114 invoked by alias); 22 Jan 2014 12:45:17 -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 18099 invoked by uid 89); 22 Jan 2014 12:45:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.6 required=5.0 tests=AWL,BAYES_00,GARBLED_BODY autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 22 Jan 2014 12:45:16 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1W5xB9-0002FW-T1 from Yao_Qi@mentor.com ; Wed, 22 Jan 2014 04:45:11 -0800 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 22 Jan 2014 04:45:11 -0800 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.2.247.3; Wed, 22 Jan 2014 04:45:11 -0800 Message-ID: <52DFBCD8.4010404@codesourcery.com> Date: Wed, 22 Jan 2014 12:45:00 -0000 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Joel Brobecker CC: Subject: Re: reject merges on gdb release branches? References: <20140122051133.GB4762@adacore.com> <52DF5B39.1020209@codesourcery.com> <20140122073709.GE4762@adacore.com> In-Reply-To: <20140122073709.GE4762@adacore.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2014-01/txt/msg00853.txt.bz2 On 01/22/2014 03:37 PM, Joel Brobecker wrote: > You are doing thing correctly. Another way to do things, if you have > a large number of commits to push, is to "git rebase your-branch master; > git checkout master; git merge your-branch", which should result in > a "fast-forward merge" (which is actually not technically a merge). > For more info, I really recommend you read a book such as "Pro Git", > as understanding the models behind git is a worthwhile investment. Thanks for the explanation. > > The purpose of this proposal is to make sure that people don't do > "git merge my-commit-on-master" and push that to the release branch. > This would have catastrophic consequences, as it would bring into > the branch all commits on master since we created the release branch. > Not what the contributor wanted, but very easy to do if you don't > know git well enough. That is true. -- Yao (齐尧)