From: Benoit SIGOURE <tsuna@lrde.epita.fr>
Date: Sun, 04 Nov 2007 13:50:25 GMT
Subject: Re: [PATCH] user-manual: add advanced topic "bisecting merges"
Message-ID: <C6820C23-1727-46B5-80A7-BD8DF8C3EF92@lrde.epita.fr>
In-Reply-To: <11941677732664-git-send-email-prohaska@zib.de>

On Nov 4, 2007, at 10:16 AM, Steffen Prohaska wrote:

> diff --git a/Documentation/user-manual.txt b/Documentation/user- 
> manual.txt
> index d99adc6..480e7c1 100644
> --- a/Documentation/user-manual.txt
> +++ b/Documentation/user-manual.txt
> @@ -934,6 +934,95 @@ Figuring out why this works is left as an  
> exercise to the (advanced)
[...]
> +
> +Imagine this history.
> +
> +................................................
> +      ---Z---o---X---...---o---A---C---D
> +          \                       /
> +           o---o---Y---...---o---B
> +................................................
> +

I don't know how you chose these letters, but I don't find them  
particularly intuitive to remember.

................................................
       ---B---o---X---...---o---Y---M---H
           \                       /
            o---o---T---...---o---Z
................................................

would be better (IMO):  B stands for "Branch point"
                         M stands for "Merge"
                         H stands for "HEAD"
                         T stands for "Topic"


Otherwise thanks for documenting this, the patch looks fine to me.

-- 
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory