From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 4 May 2006 00:46:44 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.3.1-g935e
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=46338f57d48fac86cd37a48fc6cb4b4219cea276;p=git.git

Autogenerated HTML docs for v1.3.1-g935e
---

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 31948673..0a2f8213 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -614,7 +614,7 @@ separated with a single space are given.</p>
 </p>
 </dd>
 <dt>
--cc
+--cc
 </dt>
 <dd>
 <p>
@@ -1000,7 +1000,7 @@ two unresolved merge parents with the working tree file
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 16-Apr-2006 11:00:57 UTC
+Last updated 04-May-2006 00:46:25 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-tree.txt b/git-diff-tree.txt
index 21691698..906830d4 100644
--- 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 00a23c7e..2aed335a 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]
              [--info-only] [--index-info]
              [-z] [--stdin]
              [--verbose]
@@ -395,6 +395,15 @@ using the various options:</p>
 </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>
@@ -696,7 +705,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-May-2006 00:46:26 UTC
 </div>
 </div>
 </body>
diff --git a/git-update-index.txt b/git-update-index.txt
index d4137fc8..23f2b6f1 100644
--- 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