Re: svn user trying to recover from brain damage

[Carl Worth <cworth@cworth.org>]

[-- Attachment #1: Type: text/plain, Size: 1543 bytes --]

On Wed, 9 May 2007 10:30:18 -0500, "Joshua Ball" wrote:
> Is there a difference between HEAD and the working tree?

Yes. HEAD is a pointer to committed state. HEAD is an alias for the
current branch.

> Does HEAD change when I cg-switch/git-checkout?

Yes.

> What is an object?

It's a low-level aspect of git's unified storage model. The various
object types, (blob, tree, commit, tag),  are defined quite clearly in
the documentation.

> What the heck is a branch?

Simply a pointer to the DAG that moves as new commits are created
while "on" that branch.

> More on branches: The wiki says that a group of commits linked
> together form a DAG.

Yes.

>                      Does that mean every fork/clone/branch-create
> possibly doubles the number of branches.

No. Creating a new branch simply references some existing commit in
the DAG already.

>                                           So if I fork and then
> remerge, do I have two branches?
>
> A -> B -> D
> A -> C -> D

No. If you merged you would have history that looks like this:

 /-> B -\
A        D
 \-> C -/

> Is there a standard revision notation?

Yes. See the documentation for git-rev-parse and the section on
specifing revisions, (hint: when you run a command like "git log" and
see long sequence of hex characters, you can use those (or abbreviated
versions of those) to name revisons). You can also do many other
things as described in the documentation.

[Beyond this point you bring in too many svn misconceptions to make
the questions easy to answer.]

-Carl

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]