X-Authentication-Warning:	delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient:	geda-user AT delorie DOT com
X-Original-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=gmail.com; s=20120113;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:content-type;
	bh=nCXZc3ocdBeO1bqUiVWGVcF7H5O+WTqTb2/zf4d2r34=;
	b=TxXqNWusjJjqDz3I9bIpnYtbeb/QkEq56lUSYW2K5EOD8BFDevrwQ9wft3crpeBEyv
	OPgmG5X3uYuueabOSnvE0Iup7eEFgr+Plvs8FU9qUCl4RZm9o1gDlKff+mBe9V4HFPaQ
	R+OzsZucHCzZpzIPWWX05LQP69xDQviy+ryety6tssRgIfOSyR6kmIE0aFyquWE8kqKo
	/gMtO9xcdVHfGGiwVJGsMcT5xoQdF+u0i+3rR+6c5mTRTmfUM3TB17hkQOHyG4GSQzVY
	UZAQRSsmYQ5y+yO1LErMYrFQ691ORAbeJGzQcsXXwA0NN2p/AXTwVm5mPgurlU/wrzS9
	GwBw==
MIME-Version:	1.0
X-Received:	by 10.180.89.101 with SMTP id bn5mr18577546wib.20.1444162989665;
	Tue, 06 Oct 2015 13:23:09 -0700 (PDT)
In-Reply-To:	<20151006195807.20938.qmail@stuge.se>
References:	<20151006115833 DOT GA6570 AT visitor2 DOT iram DOT es>
	<5613C2EC DOT 7080900 AT jump-ing DOT de>
	<20151006132005 DOT GA5039 AT visitor2 DOT iram DOT es>
	<5613DDD9 DOT 7090001 AT jump-ing DOT de>
	<CABuVarJXCb0VRXDX98JzjheLqMULeBE_SzbXz3ZO30BzPzeQEw AT mail DOT gmail DOT com>
	<56142443 DOT 5040209 AT jump-ing DOT de>
	<20151006195807 DOT 20938 DOT qmail AT stuge DOT se>
Date:	Tue, 6 Oct 2015 12:23:09 -0800
Message-ID:	<CAC4O8c-JKFVzuBSVeBTDXs-W+f6xGAQMEM-gTFS11_xR6L0GVg@mail.gmail.com>
Subject:	Re: [geda-user] How to fix gerbv to compile with gcc5?
From:	"Britton Kerin (britton DOT kerin AT gmail DOT com) [via geda-user AT delorie DOT com]" <geda-user AT delorie DOT com>
To:	geda-user AT delorie DOT com
Reply-To:	geda-user AT delorie DOT com
Errors-To:	nobody AT delorie DOT com
X-Mailing-List:	geda-user AT delorie DOT com
X-Unsubscribes-To:	listserv AT delorie DOT com

--f46d0444eba3ff3bd305217565c0
Content-Type: text/plain; charset=UTF-8

On Tue, Oct 6, 2015 at 11:58 AM, Peter Stuge (peter AT stuge DOT se) [via
geda-user AT delorie DOT com] <geda-user AT delorie DOT com> wrote:

> Markus Hitter (mah AT jump-ing DOT de) [via geda-user AT delorie DOT com] wrote:
> > Personal wish: please try to resist to do a full merge. Cherry-picking,
> > fast-forward rebasing or fast-forward merging is just fine for such
> tasks.
>

What's the difference between fast-forward rebase and fast-forward merge
anyway?

--f46d0444eba3ff3bd305217565c0
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><br><div class=3D"gmail_extra"><br><div class=3D"gmail_quo=
te">On Tue, Oct 6, 2015 at 11:58 AM, Peter Stuge (<a href=3D"mailto:peter AT s=
tuge.se">peter AT stuge DOT se</a>) [via <a href=3D"mailto:geda-user AT delorie DOT com">=
geda-user AT delorie DOT com</a>] <span dir=3D"ltr">&lt;<a href=3D"mailto:geda-use=
r AT delorie DOT com" target=3D"_blank">geda-user AT delorie DOT com</a>&gt;</span> wrote=
:<br><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-le=
ft:1px #ccc solid;padding-left:1ex"><span class=3D"">Markus Hitter (<a href=
=3D"mailto:mah AT jump-ing DOT de">mah AT jump-ing DOT de</a>) [via <a href=3D"mailto:ged=
a-user AT delorie DOT com">geda-user AT delorie DOT com</a>] wrote:<br>
&gt; Personal wish: please try to resist to do a full merge. Cherry-picking=
,<br>
&gt; fast-forward rebasing or fast-forward merging is just fine for such ta=
sks.<br></span></blockquote><div><br></div><div style=3D"">What&#39;s the d=
ifference between fast-forward rebase and fast-forward merge anyway?</div><=
div style=3D""><br></div></div></div></div>

--f46d0444eba3ff3bd305217565c0--

- Raw text -