Autogenerated HTML docs for v1.3.1-g935e

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

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