Autogenerated HTML docs for v1.4.0-rc1-gfd7e

[git.git] / git-update-index.html

diff --git a/git-update-index.html b/git-update-index.html
index 00a23c7..4fe4bf7 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] [--again]\r
              [--info-only] [--index-info]\r
              [-z] [--stdin]\r
              [--verbose]\r
@@ -313,7 +313,7 @@ using the various options:</p>
 <p>\r
         If a specified file is in the index but is missing then it's\r
         removed.\r
-        Default behaviour is to ignore removed file.\r
+        Default behavior is to ignore removed file.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -395,6 +395,24 @@ using the various options:</p>
 </p>\r
 </dd>\r
 <dt>\r
+--again\r
+</dt>\r
+<dd>\r
+<p>\r
+        Runs <tt>git-update-index</tt> itself on the paths whose index\r
+        entries are different from those from the <tt>HEAD</tt> commit.\r
+</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
@@ -454,7 +472,7 @@ using the various options:</p>
 </p>\r
 </dd>\r
 <dt>\r
-&#8212;\r
+--\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -696,7 +714,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-Jun-2006 07:24:33 UTC\r
 </div>\r
 </div>\r
 </body>\r