Autogenerated HTML docs for v1.8.0-273-g2d242

1 files changed, 7 insertions, 3 deletions

diff --git a/git-fast-import.html b/git-fast-import.html
index 1fdd36822..6e9791e83 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -1135,7 +1135,9 @@ their syntax.</p></div>
 <h4 id="_tt_from_tt"><tt>from</tt></h4>

 <div class="paragraph"><p>The <tt>from</tt> command is used to specify the commit to initialize

 this branch from.  This revision will be the first ancestor of the

-new commit.</p></div>

+new commit.  The state of the tree built at this commit will begin

+with the state at the <tt>from</tt> commit, and be altered by the content

+modifications in this commit.</p></div>

 <div class="paragraph"><p>Omitting the <tt>from</tt> 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.

@@ -1192,7 +1194,9 @@ fast-import to resolve the commit through Git&#8217;s revision parsing library,
 rather than its internal branch table, thereby loading in the

 existing value of the branch.</p></div>

 <h4 id="_tt_merge_tt"><tt>merge</tt></h4>

-<div class="paragraph"><p>Includes one additional ancestor commit.  If the <tt>from</tt> command is

+<div class="paragraph"><p>Includes one additional ancestor commit.  The additional ancestry

+link does not change the way the tree state is built at this commit.

+If the <tt>from</tt> command is

 omitted when creating a new branch, the first <tt>merge</tt> commit will be

 the first ancestor of the current commit, and the branch will start

 out with no files.  An unlimited number of <tt>merge</tt> commands per

@@ -2171,7 +2175,7 @@ compression.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2012-09-18 15:30:10 PDT

+Last updated 2012-11-21 13:58:35 PDT

 </div>

 </div>

 </body>