From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 123075 invoked by alias); 28 May 2015 10:11:07 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Received: (qmail 123060 invoked by uid 89); 28 May 2015 10:11:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,MIME_BASE64_BLANKS,RCVD_IN_DNSWL_NONE,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mailapp01.imgtec.com Received: from mailapp01.imgtec.com (HELO mailapp01.imgtec.com) (195.59.15.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 28 May 2015 10:11:05 +0000 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 7115CD585DCEC; Thu, 28 May 2015 11:11:00 +0100 (IST) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 28 May 2015 11:11:02 +0100 Received: from LEMAIL01.le.imgtec.org ([fe80::5ae:ee16:f4b9:cda9]) by LEMAIL01.le.imgtec.org ([fe80::5ae:ee16:f4b9:cda9%17]) with mapi id 14.03.0210.002; Thu, 28 May 2015 11:11:02 +0100 From: Matthew Fortune To: Phil Muldoon , gdb Subject: RE: Personal branches and restrictions with GIT repository Date: Thu, 28 May 2015 10:11:00 -0000 Message-ID: <6D39441BF12EF246A7ABCE6654B02353210632C0@LEMAIL01.le.imgtec.org> References: <5566E465.3080909@redhat.com> In-Reply-To: <5566E465.3080909@redhat.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 MIME-Version: 1.0 X-IsSubscribed: yes X-SW-Source: 2015-05/txt/msg00032.txt.bz2 PiBnaXQgY2hlY2tvdXQgbWFzdGVyOyBnaXQgcHVsbDsgZ2l0IGNoZWNrb3V0 IHVzZXJzL3BtdWxkb29uL2MrK2NvbXBpbGU7DQo+IGdpdCBtZXJnZSBtYXN0 ZXI7IGdpdCBwdXNoDQo+IA0KPiBUaGlzIGp1c3QgbWFrZXMgbXkgYnJhbmNo ID0gTWFzdGVyICsgbXkgY2hhbmdlcy4gSXQgZG9lcyBub3QsIG9mIGNvdXJz ZSwNCj4gYWZmZWN0IE1hc3RlciBpbiBhbnkgd2F5Lg0KDQpJZiB0aGUgbG9u ZyB0ZXJtIGFpbSBpcyB0byBzdWJtaXQgdGhlIGNvZGUgdG8gbWFzdGVyIHlv dSBtYXkgZmluZCBpdA0KZWFzaWVyIHRvIHJlYmFzZSBhbmQgZm9yY2UgcHVz aCB0byB5b3VyIHBlcnNvbmFsIGJyYW5jaC4gSSdtIGFzc3VtaW5nDQpmb3Jj ZSBwdXNoIHRvIGEgcGVyc29uYWwgYnJhbmNoIGlzIGFsbG93ZWQuDQoNClRo aXMga2VlcHMgYWxsIHlvdXIgY29tbWl0cyBhdCB0aGUgdG9wIHRvby4gVGhp cyBtZXRob2Qgd29ya3Mgd2VsbCB1bnRpbA0KeW91IGhhdmUgbXVsdGlwbGUg Y29udHJpYnV0b3JzIGJ1dCB3aXRoIHNvbWUgcHJhY3RpY2UgaXQgaXMgcG9z c2libGUgdG8NCndvcmsgYXMgYSBncm91cCB3aXRoIHJlYmFzZStmb3JjZSBw dXNoLg0KDQpNYXR0aGV3DQoNCg== >From gdb-return-44389-listarch-gdb=sources.redhat.com@sourceware.org Thu May 28 10:16:19 2015 Return-Path: Delivered-To: listarch-gdb@sources.redhat.com Received: (qmail 5847 invoked by alias); 28 May 2015 10:16:18 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Delivered-To: mailing list gdb@sourceware.org Received: (qmail 5835 invoked by uid 89); 28 May 2015 10:16:18 -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,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 28 May 2015 10:16:17 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id CE94319F25F; Thu, 28 May 2015 10:16:15 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4SAGEwg006150; Thu, 28 May 2015 06:16:14 -0400 Message-ID: <5566EAED.6090502@redhat.com> Date: Thu, 28 May 2015 10:16:00 -0000 From: Phil Muldoon MIME-Version: 1.0 To: Matthew Fortune , gdb Subject: Re: Personal branches and restrictions with GIT repository References: <5566E465.3080909@redhat.com> <6D39441BF12EF246A7ABCE6654B02353210632C0@LEMAIL01.le.imgtec.org> In-Reply-To: <6D39441BF12EF246A7ABCE6654B02353210632C0@LEMAIL01.le.imgtec.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2015-05/txt/msg00033.txt.bz2 Content-length: 1079 On 28/05/15 11:11, Matthew Fortune wrote: >> git checkout master; git pull; git checkout users/pmuldoon/c++compile; >> git merge master; git push >> >> This just makes my branch = Master + my changes. It does not, of course, >> affect Master in any way. > > If the long term aim is to submit the code to master you may find it > easier to rebase and force push to your personal branch. I'm assuming > force push to a personal branch is allowed. > > This keeps all your commits at the top too. This method works well until > you have multiple contributors but with some practice it is possible to > work as a group with rebase+force push. > > Matthew I don't want to get into GIT work-flows ;) There are seemingly dozens of ways to do the same thing in GIT. But as the branch has to go through review first, and that entails a patch series, I normally just rebase at the end to another temporary branch and squash commits to create that patch-series. That's worked quite well for me. You can't rebase or force commit to a personal branch either, as I understand. Cheers Phil