Autogenerated HTML docs for v1.7.12-70-g851f7

1 files changed, 21 insertions, 7 deletions

diff --git a/git-rev-list.html b/git-rev-list.html
index 94ab07e60..e82955d2a 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -1476,23 +1476,37 @@ after all the sorted commit objects, there will be the same text as if
 <div class="paragraph"><p>By default, the commits are shown in reverse chronological order.</p></div>

 <div class="dlist"><dl>

 <dt class="hdlist1">

---topo-order

+--date-order

 </dt>

 <dd>

 <p>

-        This option makes them appear in topological order (i.e.

-        descendant commits are shown before their parents).

+        Show no parents before all of its children are shown, but

+        otherwise show commits in the commit timestamp order.

 </p>

 </dd>

 <dt class="hdlist1">

---date-order

+--topo-order

 </dt>

 <dd>

 <p>

-        This option is similar to <em>--topo-order</em> in the sense that no

-        parent comes before all of its children, but otherwise things

-        are still ordered in the commit timestamp order.

+        Show no parents before all of its children are shown, and

+        avoid showing commits on multiple lines of history

+        intermixed.

 </p>

+<div class="paragraph"><p>For example, in a commit history like this:</p></div>

+<div class="listingblock">

+<div class="content">

+<pre><tt>    ---1----2----4----7

+        \              \

+         3----5----6----8---</tt></pre>

+</div></div>

+<div class="paragraph"><p>where the numbers denote the order of commit timestamps, <tt>git

+rev-list</tt> and friends with <tt>--date-order</tt> show the commits in the

+timestamp order: 8 7 6 5 4 3 2 1.</p></div>

+<div class="paragraph"><p>With <tt>--topo-order</tt>, 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.</p></div>

 </dd>

 <dt class="hdlist1">

 --reverse