rev-list docs: clarify --topo-order description

It was unclear what "--topo-order" was really about in the
documentation.  It is not just about "children before parent", but
also about "don't mix lineages".

Reword the description for both "--date-order" and "--topo-order",
and add an illustration to it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-08-15 13:02:48 -07:00
Родитель d0f1ea6003
Коммит 3f0350ccd5
1 изменённых файлов: 25 добавлений и 8 удалений

Просмотреть файл

@ -578,16 +578,33 @@ Commit Ordering
By default, the commits are shown in reverse chronological order. By default, the commits are shown in reverse chronological order.
--topo-order::
This option makes them appear in topological order (i.e.
descendant commits are shown before their parents).
--date-order:: --date-order::
Show no parents before all of its children are shown, but
otherwise show commits in the commit timestamp order.
This option is similar to '--topo-order' in the sense that no --topo-order::
parent comes before all of its children, but otherwise things Show no parents before all of its children are shown, and
are still ordered in the commit timestamp order. avoid showing commits on multiple lines of history
intermixed.
+
For example, in a commit history like this:
+
----------------------------------------------------------------
---1----2----4----7
\ \
3----5----6----8---
----------------------------------------------------------------
+
where the numbers denote the order of commit timestamps, `git
rev-list` and friends with `--date-order` show the commits in the
timestamp order: 8 7 6 5 4 3 2 1.
+
With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
3 1); some older commits are shown before newer ones in order to
avoid showing the commits from two parallel development track mixed
together.
--reverse:: --reverse::