X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-rev-list.html;h=029362911d9eecbc24ed88dc0fc305922d7e427d;hb=a8adb1ec550d7d7a66cd4d362cfbd01795d71f43;hp=461300738dc1169f60d39a51863f3004b9686d2a;hpb=235a91e6b0d1d18a2517cf7e0a18278a6912bdb0;p=git.git

diff --git a/git-rev-list.html b/git-rev-list.html
index 46130073..02936291 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -278,10 +278,11 @@ git-rev-list(1) Manual Page
              [ --min-age=timestamp ]
              [ --sparse ]
              [ --no-merges ]
+             [ --remove-empty ]
              [ --all ]
-             [ [ --merge-order [ --show-breaks ] ] | [ --topo-order ] ]
+             [ --topo-order ]
              [ --parents ]
-             [ --objects [ --unpacked ] ]
+             [ [--objects | --objects-edge] [ --unpacked ] ]
              [ --pretty | --header ]
              [ --bisect ]
              &lt;commit&gt;&#8230; [ -- &lt;paths&gt;&#8230; ]</div></div>
@@ -330,6 +331,19 @@ short-hand for ^&lt;commit1&gt; &lt;commit2&gt;.</p>
 </p>
 </dd>
 <dt>
+--objects-edge
+</dt>
+<dd>
+<p>
+        Similar to <tt>--objects</tt>, but also print the IDs of
+        excluded commits refixed with a <tt>-</tt> character.  This is
+        used by <tt>git-pack-objects</tt> to build <em>thin</em> pack, which
+        records objects in deltified form based on objects
+        contained in these excluded commits to reduce network
+        traffic.
+</p>
+</dd>
+<dt>
 --unpacked
 </dt>
 <dd>
@@ -383,6 +397,14 @@ short-hand for ^&lt;commit1&gt; &lt;commit2&gt;.</p>
 </p>
 </dd>
 <dt>
+--remove-empty
+</dt>
+<dd>
+<p>
+        Stop when a given path disappears from the tree.
+</p>
+</dd>
+<dt>
 --all
 </dt>
 <dd>
@@ -402,67 +424,11 @@ short-hand for ^&lt;commit1&gt; &lt;commit2&gt;.</p>
         before their parents).
 </p>
 </dd>
-<dt>
---merge-order
-</dt>
-<dd>
-<p>
-        When specified the commit history is decomposed into a unique
-        sequence of minimal, non-linear epochs and maximal, linear epochs.
-        Non-linear epochs are then linearised by sorting them into merge
-        order, which is described below.
-</p>
-<p>Maximal, linear epochs correspond to periods of sequential development.
-Minimal, non-linear epochs correspond to periods of divergent development
-followed by a converging merge. The theory of epochs is described in more
-detail at
-<a href="http://blackcubes.dyndns.org/epoch/">http://blackcubes.dyndns.org/epoch/</a>.</p>
-<p>The merge order for a non-linear epoch is defined as a linearisation for which
-the following invariants are true:</p>
-<ol>
-<li>
-<p>
-if a commit P is reachable from commit N, commit P sorts after commit N
-       in the linearised list.
-</p>
-</li>
-<li>
-<p>
-if Pi and Pj are any two parents of a merge M (with i &lt; j), then any
-       commit N, such that N is reachable from Pj but not reachable from Pi,
-       sorts before all commits reachable from Pi.
-</p>
-<p>Invariant 1 states that later commits appear before earlier commits they are
-derived from.</p>
-<p>Invariant 2 states that commits unique to "later" parents in a merge, appear
-before all commits from "earlier" parents of a merge.</p>
-</li>
-</ol>
-</dd>
-<dt>
---show-breaks
-</dt>
-<dd>
-<p>
-        Each item of the list is output with a 2-character prefix consisting
-        of one of: (|), (^), (=) followed by a space.
-</p>
-<p>Commits marked with (=) represent the boundaries of minimal, non-linear epochs
-and correspond either to the start of a period of divergent development or to
-the end of such a period.</p>
-<p>Commits marked with (|) are direct parents of commits immediately preceding
-the marked commit in the list.</p>
-<p>Commits marked with (^) are not parents of the immediately preceding commit.
-These "breaks" represent necessary discontinuities implied by trying to
-represent an arbitrary DAG in a linear form.</p>
-<p><tt>--show-breaks</tt> is only valid if <tt>--merge-order</tt> is also specified.</p>
-</dd>
 </dl>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
-<p>Original <strong>--merge-order</strong> logic by Jon Seymour &lt;jon.seymour@gmail.com&gt;</p>
 </div>
 <h2>Documentation</h2>
 <div class="sectionbody">
@@ -474,7 +440,7 @@ represent an arbitrary DAG in a linear form.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-Jan-2006 17:12:43 PDT
+Last updated 04-Mar-2006 22:16:33 UTC
 </div>
 </div>
 </body>
