From: Santi Béjar <sbejar@gmail.com>
Date: Wed, 03 Jan 2007 17:31:06 GMT
Subject: Re: [PATCH] Documentation/tutorial: misc updates
Message-ID: <8aa486160701030931mfc14c85tb6815002cac8c6fd@mail.gmail.com>
In-Reply-To: <7vejqcoz7s.fsf@assigned-by-dhcp.cox.net>

On 1/3/07, Junio C Hamano <junkio@cox.net> wrote:
> "Santi Béjar" <sbejar@gmail.com> writes:
>
> > On 1/3/07, Horst H. von Brand <vonbrand@inf.utfsm.cl> wrote:
> >> Santi Béjar <sbejar@gmail.com> wrote:
> >> >
> >> > -Every commit has at least one "parent" commit, which points to the
> >> > -previous state of the project:
> >> > +Every commit has at least one "parent" commit (except the first),
> >> > +which points to the previous state of the project:
> >>
> >> And how can it have more than one parent? If you mention it, better come
> >> clean about merges (can be explained in detail later).
> >
> > I have not mentined it, I've just added the exception that the
> > firt/root commits have zero parents.
>
> Well, it does not matter who originally is at fault ;-).

Sure, we all try to make git better and better.

>
> Let's just do this.
>
> diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
> index f0a5526..0cc234f 100644
> --- a/Documentation/tutorial.txt
> +++ b/Documentation/tutorial.txt
> @@ -400,7 +400,7 @@ $ git show HEAD             # the tip of the current branch
>  $ git show experimental        # the tip of the "experimental" branch
>  -------------------------------------
>
> -Every commit has at least one "parent" commit (except the first),
> +Every commit usually has one "parent" commit
>  which points to the previous state of the project:
>
>  -------------------------------------
>
> After this paragraph, we say "merge has more than one", so it's
> all consistent and presented in the right order.  By the time
> the reader starts wondering about the initial commit, we've
> shown the use of HEAD^^^^ and HEAD~$n enough that the reader can
> experiment on his/her own.

OK here.

Santi