X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
Message-ID: <20151006212739.28823.qmail@stuge.se>
Date: Tue, 6 Oct 2015 23:27:39 +0200
From: "Peter Stuge (peter AT stuge DOT se) [via geda-user AT delorie DOT com]" <geda-user AT delorie DOT com>
To: geda-user AT delorie DOT com
Subject: Re: [geda-user] How to fix gerbv to compile with gcc5?
Mail-Followup-To: geda-user AT delorie DOT com
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> <CAC4O8c-JKFVzuBSVeBTDXs-W+f6xGAQMEM-gTFS11_xR6L0GVg AT mail DOT gmail DOT com> <5614375D DOT 1050603 AT jump-ing DOT de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <5614375D.1050603@jump-ing.de>
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
Precedence: bulk

Markus Hitter (mah AT jump-ing DOT de) [via geda-user AT delorie DOT com] wrote:
> > What's the difference between fast-forward rebase and fast-forward merge
> > anyway?
> 
> The characters one types at the command line to get it done :-) Rebasing
> and merging only differ in the non-fast-forward case.
> 
> Cherry-picking is slightly different, it creates identical, but new
> commits. New commits have a different hash.

Just a note that rebasing onto a new base is technically cherry-picking;
they're identical when the base changes.


//Peter