Autogenerated HTML docs for v1.5.1-53-g77e6f

diff --git a/git-fsck.html b/git-fsck.html
index 684d0546f17e7fb3b62fa1b8f3174999a4396328..0b549c21e2388edbaa44f1e9984dd62b715493d0 100644 (file)
--- a/git-fsck.html
+++ b/git-fsck.html
@@ -273,7 +273,7 @@ git-fsck(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-fsck</em> [--tags] [--root] [--unreachable] [--cache]\r
+<div class="content"><em>git-fsck</em> [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\r
                  [--full] [--strict] [&lt;object&gt;*]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -328,6 +328,17 @@ index file and all SHA1 references in .git/refs/* as heads.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--no-reflogs\r
+</dt>\r
+<dd>\r
+<p>\r
+        Do not consider commits that are referenced only by an\r
+        entry in a reflog to be reachable.  This option is meant\r
+        only to search for commits that used to be in a ref, but\r
+        now aren't, but are still in that corresponding reflog.\r
+</p>\r
+</dd>\r
+<dt>\r
 --full\r
 </dt>\r
 <dd>\r
@@ -491,7 +502,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:43 UTC\r
+Last updated 06-Apr-2007 00:51:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fsck.txt b/git-fsck.txt
index 058009d2fab4c73edcbfefe7b48c5f9348459da3..8c68cf037259b3abc7ea16952d232b2fb2f07a25 100644 (file)
--- a/git-fsck.txt
+++ b/git-fsck.txt
@@ -9,7 +9,7 @@ git-fsck - Verifies the connectivity and validity of the objects in the database
 SYNOPSIS
 --------
 [verse]
-'git-fsck' [--tags] [--root] [--unreachable] [--cache]
+'git-fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
                 [--full] [--strict] [<object>*]
 
 DESCRIPTION
@@ -38,6 +38,12 @@ index file and all SHA1 references in .git/refs/* as heads.
        Consider any object recorded in the index also as a head node for
        an unreachability trace.
 
+--no-reflogs::
+       Do not consider commits that are referenced only by an
+       entry in a reflog to be reachable.  This option is meant
+       only to search for commits that used to be in a ref, but
+       now aren't, but are still in that corresponding reflog.
+
 --full::
        Check not just objects in GIT_OBJECT_DIRECTORY
        ($GIT_DIR/objects), but also the ones found in alternate

diff --git a/git-rev-list.html b/git-rev-list.html
index a234345d930b6a6d36b7077a5a7b3690a167d3e5..653d8bc52d210eba2a89b610faf96395aa87978d 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -285,6 +285,7 @@ git-rev-list(1) Manual Page
              [ --stdin ]\r
              [ --topo-order ]\r
              [ --parents ]\r
+             [ --left-right ]\r
              [ --encoding[=<encoding>] ]\r
              [ --(author|committer|grep)=<pattern> ]\r
              [ [--objects | --objects-edge] [ --unpacked ] ]\r
@@ -654,6 +655,38 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff
         Print the parents of the commit.\r
 </p>\r
 </dd>\r
+<dt>\r
+--left-right\r
+</dt>\r
+<dd>\r
+<p>\r
+        Mark which side of a symmetric diff a commit is reachable from.\r
+        Commits from the left side are prefixed with <tt>&lt;</tt> and those from\r
+        the right with <tt>&gt;</tt>.  If combined with <tt>--boundary</tt>, those\r
+        commits are prefixed with <tt>-</tt>.\r
+</p>\r
+<p>For example, if you have this topology:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>             y---b---b  branch B\r
+            / \ /\r
+           /   .\r
+          /   / \\r
+         o---x---a---a  branch A</tt></pre>\r
+</div></div>\r
+<p>you would get an output line this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        $ git rev-list --left-right --boundary --pretty=oneline A...B\r
+\r
+        &gt;bbbbbbb... 3rd on b\r
+        &gt;bbbbbbb... 2nd on b\r
+        &lt;aaaaaaa... 3rd on a\r
+        &lt;aaaaaaa... 2nd on a\r
+        -yyyyyyy... 1st on b\r
+        -xxxxxxx... 1st on a</tt></pre>\r
+</div></div>\r
+</dd>\r
 </dl>\r
 </li>\r
 </ul>\r
@@ -979,7 +1012,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:13 UTC\r
+Last updated 06-Apr-2007 00:51:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index 3fa45b81cc6de7b5104d343538c9ad040c208ce1..12b71ed0bbae2516cb67c98c96a56e6278a6f5c2 100644 (file)
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -21,6 +21,7 @@ SYNOPSIS
             [ \--stdin ]
             [ \--topo-order ]
             [ \--parents ]
+            [ \--left-right ]
             [ \--encoding[=<encoding>] ]
             [ \--(author|committer|grep)=<pattern> ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
@@ -101,6 +102,36 @@ include::pretty-formats.txt[]
 
        Print the parents of the commit.
 
+--left-right::
+
+       Mark which side of a symmetric diff a commit is reachable from.
+       Commits from the left side are prefixed with `<` and those from
+       the right with `>`.  If combined with `--boundary`, those
+       commits are prefixed with `-`.
++
+For example, if you have this topology:
++
+-----------------------------------------------------------------------
+             y---b---b  branch B
+            / \ /
+           /   .
+          /   / \
+         o---x---a---a  branch A
+-----------------------------------------------------------------------
++
+you would get an output line this:
++
+-----------------------------------------------------------------------
+       $ git rev-list --left-right --boundary --pretty=oneline A...B
+
+       >bbbbbbb... 3rd on b
+       >bbbbbbb... 2nd on b
+       <aaaaaaa... 3rd on a
+       <aaaaaaa... 2nd on a
+       -yyyyyyy... 1st on b
+       -xxxxxxx... 1st on a
+-----------------------------------------------------------------------
+
 Diff Formatting
 ~~~~~~~~~~~~~~~
 

diff --git a/git.html b/git.html
index 5630130a21443fa8f7c6f4728b574f883dfc692d..9aa19ac03e63a86089e942fe3ce16d6088d13704 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2317,7 +2317,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:38 UTC\r
+Last updated 06-Apr-2007 00:51:17 UTC\r
 </div>\r
 </div>\r
 </body>\r