This is the mail archive of the
mailing list for the GCC project.
Re: Moving to git
- From: Jonathan Wakely <jwakely dot gcc at gmail dot com>
- To: ramrad01 at arm dot com
- Cc: Jason Merrill <jason at redhat dot com>, Jeff Law <law at redhat dot com>, "gcc at gnu dot org" <gcc at gnu dot org>, Jakub Jelinek <jakub at redhat dot com>
- Date: Fri, 21 Aug 2015 11:48:17 +0100
- Subject: Re: Moving to git
- Authentication-results: sourceware.org; auth=none
- References: <55D61512 dot 8010002 at redhat dot com> <55D61B23 dot 3000309 at redhat dot com> <55D63403 dot 4000603 at redhat dot com> <CAJA7tRahuaA36w76YD0nE+6ur1Y8T1ThZ8ssSmGgRmzT9bUcBA at mail dot gmail dot com>
On 21 August 2015 at 11:44, Ramana Radhakrishnan wrote:
>> Absolutely, a non-fast-forward push is anathema for anything other people
>> might be working on. The git repository already prohibits this; people that
>> want to push-rebase-push their own branches need to delete the branch before
>> pushing again.
> On the FSF trunk and the main release branches - I agree this is a
> complete no-no.
> A push-rebase-push development model is possible / may be useful when
> the developers collaborating on that branch agree on that model.
Teams following a different model could use a separate repo shared by
those developers, not the gcc.gnu.org one. It's much easier to do that
> Given current practice of merging development branches into mainline
> being effectively a "rebase" which allows for the linear history on
> mainline to be retained, we should document very clearly how git merge
> should be used on mainline from development branches.