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

diff --git a/git.html b/git.html
index b879259d..f8cb4451 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 {
@@ -289,7 +289,7 @@ brings your stuff to the plumbing).</p>
 </dt>
 <dd>
 <p>
-        prints the git suite version that the <em>git</em> program came from.
+        Prints the git suite version that the <em>git</em> program came from.
 </p>
 </dd>
 <dt>
@@ -297,9 +297,10 @@ brings your stuff to the plumbing).</p>
 </dt>
 <dd>
 <p>
-        prints the synopsis and a list of available commands.
-        If a git command is named this option will bring up the
-        man-page for that command.
+        Prints the synopsis and a list of the most commonly used
+        commands.  If a git command is named this option will bring up
+        the man-page for that command. If the option <em>--all</em> or <em>-a</em> is
+        given then all available commands are printed.
 </p>
 </dd>
 <dt>
@@ -307,7 +308,7 @@ brings your stuff to the plumbing).</p>
 </dt>
 <dd>
 <p>
-        path to wherever your core git programs are installed.
+        Path to wherever your core git programs are installed.
         This can also be controlled by setting the GIT_EXEC_PATH
         environment variable. If no path is given <em>git</em> will print
         the current setting and then exit.
@@ -917,6 +918,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>
@@ -949,6 +958,14 @@ the working tree.</p>
 </p>
 </dd>
 <dt>
+<a href="git-show.html">git-show(1)</a>
+</dt>
+<dd>
+<p>
+        Show one commit log and its diff.
+</p>
+</dd>
+<dt>
 <a href="git-show-branch.html">git-show-branch(1)</a>
 </dt>
 <dd>
@@ -2023,7 +2040,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 18-Mar-2006 07:45:36 UTC
 </div>
 </div>
 </body>
