Re: [PATCH] user-manual: add advanced topic "bisecting merges"

[Benoit SIGOURE <tsuna@xxxxxxxxxxxxx>]

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

Attachment: PGP.sig
Description: This is a digitally signed message part