SZEDER Gábor <szeder....@gmail.com> writes: >> Hmm... >> >> > +# ,---o----o----o-----. >> > +# / D,R e \ >> > +# o--o-----o-------------o---o----x >> > +# \ B / >> > +# `---o----o----o-' >> > +# A c >> >> What's the first parent of the merge between 'B' and 'c' in this >> picture and how does the reader figure it out? What about the same >> question on the direct parent of 'x'? Is it generally accepted that >> a straight line denotes the first ancestry, or something? > > I've always thought that the parents are numbered from top to bottom, > i.e. 'B' is the first parent of the first merge, and the unnamed > commit at the top is the first parent of the second merge. > > Would it help if it were arranged like this: > > o---o-----o----o----o-------o----x > \ D,R e / > \---o-------------o-' > \ B / > `-o----o----o-' > A c > > This is basically how 'git log --graph' would show them, except that > this is horizontal.
Either is fine as long as they come with your "for a merge, earlier parents are drawn near the top of the page" rule clearly described near it (without such comment, I do not think either is clear enough). Thanks.
