From: Sébastien Pierre <sebastien@xprima.com>
Date: Wed, 29 Mar 2006 16:11:12 GMT
Subject: Re: Git terminology
Message-ID: <20060329111112.55bb8d44.sebastien@xprima.com>
In-Reply-To: <7vodzp9r8r.fsf@assigned-by-dhcp.cox.net>

On Wed, 29 Mar 2006 07:59:16 -0800
Junio C Hamano <junkio@cox.net> wrote:
 
> Probably we can just say "ref" where we say "refname".
> 
> A fast-forward is where you have a revision and you are
> "merging" other's change that happen to be a descendant what you
> have.  In such a case, you do not make a new merge commit but
> just update to his revision.  That is:
> 
>           o---o---o---o his               o---o---o---o his
>          /                      ->       /             \
>     o---o---o---o yours             o---o---o---o-------* yours
> 
> updating to his needs a merge like above, but in this case:
> 
>           o---o---o---o his               o---o---o---o his = yours
>          /                      ->       /
>     o---o yours                     o---o
> 
> you just update to his.

Ah, ok. The diagrams are really helpful to get what "fast forward" is.

Thanks !

 -- Sébastien