This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: Moving to git

From: Jason Merrill <jason at redhat dot com>
To: Andreas Schwab <schwab at linux-m68k dot org>
Cc: Ramana Radhakrishnan <ramana dot gcc at googlemail dot com>, Peter Bergner <bergner at vnet dot ibm dot com>, Jonathan Wakely <jwakely dot gcc at gmail 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 15:28:28 -0400
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> <CAH6eHdTcMMgHBax=x42aAE+LdRyKnzNhaLxvc_VcPQVP_P7nog at mail dot gmail dot com> <CAJA7tRYwEMxTrFmFNYg0Mh9QTLyNOtVPH7kjjSTzS82RPyXHfQ at mail dot gmail dot com> <87zj1kwx6g dot fsf at igel dot home> <1440169766 dot 5188 dot 62 dot camel at otta> <CAJA7tRZTyvHhXAc672WsA=ZQ9WEGeVJfjz5urpq7i1WaqOQzuA at mail dot gmail dot com> <55D76A92 dot 4080800 at redhat dot com> <87h9nsv6lj dot fsf at igel dot home> <55D77401 dot 2070907 at redhat dot com> <874mjsv468 dot fsf at igel dot home>

On 08/21/2015 03:21 PM, Andreas Schwab wrote:

Jason Merrill <jason@redhat.com> writes:

Hmm, it occurs to me that a squash commit (or series of commits) followed
by a merge -s ours could have the advantages of both approaches: the
patches land on trunk in a sensible order, but the history is available.


That would be worse, since changes are duplicated.

How duplicated? The non-squash merge would make no changes, onlyexpress that the branch is now merged.


Jason

Follow-Ups:
- Re: Moving to git
  - From: Andreas Schwab

References:
- Moving to git
  - From: Jason Merrill
- Re: Moving to git
  - From: Jeff Law
- Re: Moving to git
  - From: Jason Merrill
- Re: Moving to git
  - From: Ramana Radhakrishnan
- Re: Moving to git
  - From: Jonathan Wakely
- Re: Moving to git
  - From: Ramana Radhakrishnan
- Re: Moving to git
  - From: Andreas Schwab
- Re: Moving to git
  - From: Peter Bergner
- Re: Moving to git
  - From: Ramana Radhakrishnan
- Re: Moving to git
  - From: Jason Merrill
- Re: Moving to git
  - From: Andreas Schwab
- Re: Moving to git
  - From: Jason Merrill
- Re: Moving to git
  - From: Andreas Schwab

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]