X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-update-index.html;h=4fe4bf7eb5007ee769e800446642c3e29e4482ef;hb=33db43733d19e4dd878a9a04089535eaf47fd374;hp=00a23c7e8915e1b03e1781f1cb0f31c81050f7bc;hpb=c8d88c2181b2e1675c5057ec9446be2f6f7529b3;p=git.git

diff --git a/git-update-index.html b/git-update-index.html
index 00a23c7e..4fe4bf7e 100644
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -275,11 +275,11 @@ git-update-index(1) Manual Page
 <div class="verseblock">
 <div class="content"><em>git-update-index</em>
              [--add] [--remove | --force-remove] [--replace]
-             [--refresh [-q] [--unmerged] [--ignore-missing]]
+             [--refresh] [-q] [--unmerged] [--ignore-missing]
              [--cacheinfo &lt;mode&gt; &lt;object&gt; &lt;file&gt;]*
              [--chmod=(+|-)x]
              [--assume-unchanged | --no-assume-unchanged]
-             [--really-refresh]
+             [--really-refresh] [--unresolve] [--again]
              [--info-only] [--index-info]
              [-z] [--stdin]
              [--verbose]
@@ -313,7 +313,7 @@ using the various options:</p>
 <p>
         If a specified file is in the index but is missing then it's
         removed.
-        Default behaviour is to ignore removed file.
+        Default behavior is to ignore removed file.
 </p>
 </dd>
 <dt>
@@ -395,6 +395,24 @@ using the various options:</p>
 </p>
 </dd>
 <dt>
+--again
+</dt>
+<dd>
+<p>
+        Runs <tt>git-update-index</tt> itself on the paths whose index
+        entries are different from those from the <tt>HEAD</tt> commit.
+</p>
+</dd>
+<dt>
+--unresolve
+</dt>
+<dd>
+<p>
+        Restores the <em>unmerged</em> or <em>needs updating</em> state of a
+        file during a merge if it was cleared by accident.
+</p>
+</dd>
+<dt>
 --info-only
 </dt>
 <dd>
@@ -454,7 +472,7 @@ using the various options:</p>
 </p>
 </dd>
 <dt>
-&#8212;
+--
 </dt>
 <dd>
 <p>
@@ -696,7 +714,7 @@ need to use <tt>git-update-index --chmod=</tt>.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-Apr-2006 07:01:35 UTC
+Last updated 04-Jun-2006 07:24:33 UTC
 </div>
 </div>
 </body>