X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git.html;h=4a7f652bf3ce36f31f2a89d6fc5ae76f30635534;hb=2abe7e860dae61000d304bc1e865406ddc7e4ba1;hp=b879259d4f08e8943456788bcf81dcd34777da90;hpb=c2b0a49075827a4ad2135eb524bc252e7a6ddef9;p=git.git

diff --git a/git.html b/git.html
index b879259d..4a7f652b 100644
--- a/git.html
+++ b/git.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -917,6 +917,14 @@ the working tree.</p>
 </p>
 </dd>
 <dt>
+<a href="git-rerere.html">git-rerere(1)</a>
+</dt>
+<dd>
+<p>
+        Reuse recorded resolution of conflicted merges.
+</p>
+</dd>
+<dt>
 <a href="git-reset.html">git-reset(1)</a>
 </dt>
 <dd>
@@ -2023,7 +2031,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 22-Jan-2006 23:54:19 PDT
+Last updated 07-Feb-2006 08:04:32 UTC
 </div>
 </div>
 </body>
