Autogenerated HTML docs for v1.5.0-rc4-359-g07fe

diff --git a/git-fast-import.html b/git-fast-import.html
index 4a20ade1ebe9060d80845da3b3dfa889de07a288..49d8127174d04fba3875a48536cdcf27b99fc512 100644 (file)
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -663,16 +663,15 @@ that was selected by the --date-format=<fmt> command line option.
 See “Date Formats” above for the set of supported formats, and\r
 their syntax.</p>\r
 <h4><tt>from</tt></h4>\r
-<p>Only valid for the first commit made on this branch by this\r
-fast-import process.  The <tt>from</tt> command is used to specify the commit\r
-to initialize this branch from.  This revision will be the first\r
-ancestor of the new commit.</p>\r
-<p>Omitting the <tt>from</tt> command in the first commit of a new branch will\r
-cause fast-import to create that commit with no ancestor. This tends to be\r
-desired only for the initial commit of a project.  Omitting the\r
-<tt>from</tt> command on existing branches is required, as the current\r
-commit on that branch is automatically assumed to be the first\r
-ancestor of the new commit.</p>\r
+<p>The <tt>from</tt> command is used to specify the commit to initialize\r
+this branch from.  This revision will be the first ancestor of the\r
+new commit.</p>\r
+<p>Omitting the <tt>from</tt> command in the first commit of a new branch\r
+will cause fast-import to create that commit with no ancestor. This\r
+tends to be desired only for the initial commit of a project.\r
+Omitting the <tt>from</tt> command on existing branches is usually desired,\r
+as the current commit on that branch is automatically assumed to\r
+be the first ancestor of the new commit.</p>\r
 <p>As <tt>LF</tt> is not valid in a Git refname or SHA-1 expression, no\r
 quoting or escaping syntax is supported within <tt>&lt;committish&gt;</tt>.</p>\r
 <p>Here <tt>&lt;committish&gt;</tt> is any of the following:</p>\r
@@ -1189,7 +1188,7 @@ memory footprint (less than 2.7 MiB per active branch).</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Feb-2007 07:15:19 UTC\r
+Last updated 13-Feb-2007 05:16:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fast-import.txt b/git-fast-import.txt
index 939ec4652bea90888006adf7fd6860e43c5439ed..445f6b854404c33b970004b791721be2986cf4bf 100644 (file)
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -349,17 +349,16 @@ their syntax.
 
 `from`
 ^^^^^^
-Only valid for the first commit made on this branch by this
-fast-import process.  The `from` command is used to specify the commit
-to initialize this branch from.  This revision will be the first
-ancestor of the new commit.
-
-Omitting the `from` command in the first commit of a new branch will
-cause fast-import to create that commit with no ancestor. This tends to be
-desired only for the initial commit of a project.  Omitting the
-`from` command on existing branches is required, as the current
-commit on that branch is automatically assumed to be the first
-ancestor of the new commit.
+The `from` command is used to specify the commit to initialize
+this branch from.  This revision will be the first ancestor of the
+new commit.
+
+Omitting the `from` command in the first commit of a new branch
+will cause fast-import to create that commit with no ancestor. This
+tends to be desired only for the initial commit of a project.
+Omitting the `from` command on existing branches is usually desired,
+as the current commit on that branch is automatically assumed to
+be the first ancestor of the new commit.
 
 As `LF` is not valid in a Git refname or SHA-1 expression, no
 quoting or escaping syntax is supported within `<committish>`.

diff --git a/git-merge.html b/git-merge.html
index 2426cac1b917e2b529f4df60fa73a0cd854245fc..34c16dec18ea405d8e971638f4a6e8ea08aaa032 100644 (file)
--- a/git-merge.html
+++ b/git-merge.html
@@ -274,7 +274,7 @@ git-merge(1) Manual Page
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git-merge</em> [-n] [--no-commit] [--squash] [-s &lt;strategy&gt;]&#8230;\r
-        -m=&lt;msg&gt; &lt;remote&gt; &lt;remote&gt;&#8230;</div></div>\r
+        [-m &lt;msg&gt;] &lt;remote&gt; &lt;remote&gt;&#8230;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -570,7 +570,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jan-2007 00:37:25 UTC\r
+Last updated 13-Feb-2007 05:16:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge.txt b/git-merge.txt
index 3c08a6f7db0954d2a7fea46b0309434766f73b68..e53ff4b4e7464079ac6e19f2bceafcb44044fb39 100644 (file)
--- a/git-merge.txt
+++ b/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
-       -m=<msg> <remote> <remote>...
+       [-m <msg>] <remote> <remote>...
 
 DESCRIPTION
 -----------

diff --git a/git.html b/git.html
index ea92c28578ca61eca2f642760aa183ac106223af..237c6d54504c45d8a60f938e19500d17f0e159f5 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2296,7 +2296,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Feb-2007 07:15:22 UTC\r
+Last updated 13-Feb-2007 05:16:10 UTC\r
 </div>\r
 </div>\r
 </body>\r