Autogenerated HTML docs for v1.3.1-g935e

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 3194867..0a2f821 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -614,7 +614,7 @@ separated with a single space are given.</p>
 </p>\r
 </dd>\r
 <dt>\r
--cc\r
+--cc\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -1000,7 +1000,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Apr-2006 11:00:57 UTC\r
+Last updated 04-May-2006 00:46:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.txt b/git-diff-tree.txt
index 2169169..906830d 100644 (file)
--- a/git-diff-tree.txt
+++ b/git-diff-tree.txt
@@ -92,7 +92,7 @@ separated with a single space are given.
        Furthermore, it lists only files which were modified
        from all parents.
 
--cc::
+--cc::
        This flag changes the way a merge commit patch is displayed,
        in a similar way to the '-c' option. It implies the '-c'
        and '-p' options and further compresses the patch output

diff --git a/git-update-index.html b/git-update-index.html
index 00a23c7..2aed335 100644 (file)
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -275,11 +275,11 @@ git-update-index(1) Manual Page
 <div class="verseblock">\r
 <div class="content"><em>git-update-index</em>\r
              [--add] [--remove | --force-remove] [--replace]\r
-             [--refresh [-q] [--unmerged] [--ignore-missing]]\r
+             [--refresh] [-q] [--unmerged] [--ignore-missing]\r
              [--cacheinfo &lt;mode&gt; &lt;object&gt; &lt;file&gt;]*\r
              [--chmod=(+|-)x]\r
              [--assume-unchanged | --no-assume-unchanged]\r
-             [--really-refresh]\r
+             [--really-refresh] [--unresolve]\r
              [--info-only] [--index-info]\r
              [-z] [--stdin]\r
              [--verbose]\r
@@ -395,6 +395,15 @@ using the various options:</p>
 </p>\r
 </dd>\r
 <dt>\r
+--unresolve\r
+</dt>\r
+<dd>\r
+<p>\r
+        Restores the <em>unmerged</em> or <em>needs updating</em> state of a\r
+        file during a merge if it was cleared by accident.\r
+</p>\r
+</dd>\r
+<dt>\r
 --info-only\r
 </dt>\r
 <dd>\r
@@ -696,7 +705,7 @@ need to use <tt>git-update-index --chmod=</tt>.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Apr-2006 07:01:35 UTC\r
+Last updated 04-May-2006 00:46:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-update-index.txt b/git-update-index.txt
index d4137fc..23f2b6f 100644 (file)
--- a/git-update-index.txt
+++ b/git-update-index.txt
@@ -10,12 +10,12 @@ SYNOPSIS
 --------
 [verse]
 'git-update-index'
-            [--add] [--remove | --force-remove] [--replace] 
-            [--refresh [-q] [--unmerged] [--ignore-missing]]
+            [--add] [--remove | --force-remove] [--replace]
+            [--refresh] [-q] [--unmerged] [--ignore-missing]
             [--cacheinfo <mode> <object> <file>]\*
             [--chmod=(+|-)x]
             [--assume-unchanged | --no-assume-unchanged]
-            [--really-refresh]
+            [--really-refresh] [--unresolve]
             [--info-only] [--index-info]
             [-z] [--stdin]
             [--verbose]
@@ -80,6 +80,10 @@ OPTIONS
        filesystem that has very slow lstat(2) system call
        (e.g. cifs).
 
+--unresolve::
+       Restores the 'unmerged' or 'needs updating' state of a
+       file during a merge if it was cleared by accident.
+
 --info-only::
        Do not create objects in the object database for all
        <file> arguments that follow this flag; just insert