From: "Sébastien Pierre" <sebastien@xprima.com>
To: Junio C Hamano <junkio@cox.net>, Git ML <git@vger.kernel.org>
Subject: Re: Git terminology
Date: Wed, 29 Mar 2006 11:11:12 -0500 [thread overview]
Message-ID: <20060329111112.55bb8d44.sebastien@xprima.com> (raw)
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
prev parent reply other threads:[~2006-03-29 16:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-29 10:21 Git terminology Sébastien Pierre
2006-03-29 15:31 ` J. Bruce Fields
2006-03-29 15:59 ` Junio C Hamano
2006-03-29 16:11 ` Sébastien Pierre [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060329111112.55bb8d44.sebastien@xprima.com \
--to=sebastien@xprima.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).