On 1/19/07, Bill Lear <rael@xxxxxxxxxx> wrote:
[...]
I'm very confused by the syntax above. What does "[master^2^]" mean?
Ditto with things like "[master~3^2^2]" and "[master~3^2~2]".
They explain the relation between commits:
^ -> first parent
^n -> n-th parent
~n -> <n>th generation parent, following only the first parent.
See the manual page of git-rev-parse (or the tutorial for some simple examples).
Why is the order
[master]
[master^2]
[master^2^]
[master^]
? I would have thought [master] would be followed by [master^], not
[master^2]. Obviously I'm confused.
The order of the parents is not important.
I'm used to visual representations that show things in chronological order,
from left to right, say as
H---I---J second
/
E---F---G---K---L first
/
/ O---P---Q third
/ /
A---B---C---D---M---N master
or:
H---I---J second
/ \
E---F---G---K---L---R first
/ \
/ O---P---Q third \
/ / \ \
A---B---C---D---M---N-----------S---------T master
(third merged onto master, second onto first, first onto master)
Then, use gitk to visualize the graph.
Again, apologies if this is not the appropriate forum.
Your are welcome.
Santi
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html