This is the mail archive of the
mailing list for the GCC project.
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 14:54:57 -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>
On 08/21/2015 02:28 PM, Andreas Schwab wrote:
Jason Merrill <firstname.lastname@example.org> writes:
I would expect feature branches to merge from trunk when needed during
development. When merging the feature into trunk the developer can just
use git merge --squash and then decide whether to commit it in one hunk or
This will of course lose the history of the feature branch.
Yep. Merging vs. squashing is a subject of debate.
Keeping the history of the feature branch is both a pro and a con: it
feels bad to throw away history, but keeping it makes both browsing and
bisecting more complicated.
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. I wonder if that avoids the bisect complications?