git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [RFD] Git glossary: 'branch' and 'head' description
Date: Sun, 21 May 2006 10:30:23 +0200	[thread overview]
Message-ID: <e4p8e8$uqt$2@sea.gmane.org> (raw)
In-Reply-To: 87y7wyv72m.fsf@morpheus.hq.vtech

David Kågedal wrote:

> Jakub Narebski <jnareb@gmail.com> writes:
[...]
>> So from the user's point of view, 'branch' is simply _named line of
>> development_. Refer to topic and tracking branches.
> 
> But the definition of 'branch' in git is quite different from the
> definition in CVS or many other systems.  It CVS, each revision
> (commit) belongs to a branch, and the branch is a linear sequence of
> revisions, not a full DAG.  In git, a commit doesn't really "belong"
> in any specific branch.
> 
> So, while it makes sense to describe branches as "lines of
> development" in general terms, it is also important to note the
> specific meaning of 'branch' in the context of git; i.e. as the
> history of a single head commit.

We can always say that branch is 1-st parent linear history of head branch,
up to unmarked but computable branching/fork/creation point, i.e.

  {i = 0..N: branch-head~i}

where N is the length of the branch.

BTW. HEAD~0 == HEAD, isn't it?

-- 
Jakub Narebski
Warsaw, Poland

      parent reply	other threads:[~2006-05-21  8:30 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-05-17 11:37 [RFD] Git glossary: 'branch' and 'head' description Jakub Narebski
2006-05-17 18:28 ` Junio C Hamano
2006-05-17 19:13   ` Jakub Narebski
2006-05-17 19:57     ` Junio C Hamano
2006-05-17 20:06       ` Jakub Narebski
2006-05-19  6:53 ` David Kågedal
2006-05-19  9:21   ` Shawn Pearce
2006-05-20  0:28     ` Daniel Barkalow
2006-05-20  0:35       ` Junio C Hamano
2006-05-20  1:36         ` Daniel Barkalow
2006-05-20  2:06           ` Linus Torvalds
2006-05-21  1:01             ` Shawn Pearce
2006-05-21  8:30   ` Jakub Narebski [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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='e4p8e8$uqt$2@sea.gmane.org' \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.org \
    /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.
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 NNTP newsgroup(s).