Mercurial > hg
comparison mercurial/commands.py @ 20544:8982a5397687
log: describe graph symbols in the help
I wondered what 'x' meant and didn't find it described anywhere.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 12 Feb 2014 23:44:30 +0100 |
parents | 9ad6dae67845 |
children | c4f45ce85351 |
comparison
equal
deleted
inserted
replaced
20543:01df3660eb11 | 20544:8982a5397687 |
---|---|
3903 By default this command prints revision number and changeset id, | 3903 By default this command prints revision number and changeset id, |
3904 tags, non-trivial parents, user, date and time, and a summary for | 3904 tags, non-trivial parents, user, date and time, and a summary for |
3905 each commit. When the -v/--verbose switch is used, the list of | 3905 each commit. When the -v/--verbose switch is used, the list of |
3906 changed files and full commit message are shown. | 3906 changed files and full commit message are shown. |
3907 | 3907 |
3908 With --graph the revisions are shown as an ASCII art DAG with the most | |
3909 recent changeset at the top. | |
3910 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, | |
3911 and '+' represents a fork where the changeset from the lines below is a | |
3912 parent of the 'o' merge on the same same line. | |
3913 | |
3908 .. note:: | 3914 .. note:: |
3909 | 3915 |
3910 log -p/--patch may generate unexpected diff output for merge | 3916 log -p/--patch may generate unexpected diff output for merge |
3911 changesets, as it will only compare the merge changeset against | 3917 changesets, as it will only compare the merge changeset against |
3912 its first parent. Also, only files different from BOTH parents | 3918 its first parent. Also, only files different from BOTH parents |