mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-22 14:48:15 +02:00
Code

Merge branch 'jc/maint-rev-list-topo-doc'

Browse Source 
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".

* jc/maint-rev-list-topo-doc:
  rev-list docs: clarify --topo-order description
This commit is contained in:
Junio C Hamano 2012-08-22 11:53:20 -07:00
commit 4def968e14
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Documentation/rev-list-options.txt
View File

@ -578,16 +578,33 @@ Commit Ordering
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::
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
parent comes before all of its children, but otherwise things
are still ordered in the commit timestamp order.
--topo-order::
Show no parents before all of its children are shown, and
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::