[prev in list] [next in list] [prev in thread] [next in thread]
List: git
Subject: Re: Git terminology
From: Pierre <sebastien () xprima ! com>
Date: 2006-03-29 16:11:12
Message-ID: 20060329111112.55bb8d44.sebastien () xprima ! com
[Download RAW message or body]
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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic