Autogenerated HTML docs for v1.5.3-rc1-27-ga5e40

diff --git a/git-commit-tree.html b/git-commit-tree.html
index 0c73facf61bceb3947673e0fc0346f74b2354833..cf6b69c2d02292d742c10951698d1b710fe06124 100644 (file)
--- a/git-commit-tree.html
+++ b/git-commit-tree.html
@@ -356,7 +356,7 @@ GIT_AUTHOR_EMAIL:</p>
         name = "Your Name"\r
         email = "your@email.address.xz"</tt></pre>\r
 </div></div>\r
-<p>A commit comment is read from stdin (max 999 chars). If a changelog\r
+<p>A commit comment is read from stdin. If a changelog\r
 entry is not provided via "&lt;" redirection, "git-commit-tree" will just wait\r
 for one to be entered and terminated with ^D.</p>\r
 </div>\r
@@ -482,7 +482,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:48:57 UTC\r
+Last updated 15-Jul-2007 07:18:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit-tree.txt b/git-commit-tree.txt
index 9586b9729151efd64b3cf5f5d511dd39b664e08e..5870c2ce4759f56455cb420ce076dc95770513d4 100644 (file)
--- a/git-commit-tree.txt
+++ b/git-commit-tree.txt
@@ -72,7 +72,7 @@ GIT_AUTHOR_EMAIL:
                name = "Your Name"
                email = "your@email.address.xz"
 
-A commit comment is read from stdin (max 999 chars). If a changelog
+A commit comment is read from stdin. If a changelog
 entry is not provided via "<" redirection, "git-commit-tree" will just wait
 for one to be entered and terminated with ^D.
 

diff --git a/git-fast-import.html b/git-fast-import.html
index 760cecf21ff631b18f1a2ea33ea7eb148e399702..c537b33e26a31d17b2adad38544104a2f7f61ab4 100644 (file)
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -633,7 +633,7 @@ change to the project.</p>
         data\r
         ('from' SP &lt;committish&gt; LF)?\r
         ('merge' SP &lt;committish&gt; LF)?\r
-        (filemodify | filedelete | filerename | filedeleteall)*\r
+        (filemodify | filedelete | filecopy | filerename | filedeleteall)*\r
         LF</tt></pre>\r
 </div></div>\r
 <p>where <tt>&lt;ref&gt;</tt> is the name of the branch to make the commit on.\r
@@ -652,13 +652,13 @@ message (see below for <tt>data</tt> command syntax).  To import an empty
 commit message use a 0 length data.  Commit messages are free-form\r
 and are not interpreted by Git.  Currently they must be encoded in\r
 UTF-8, as fast-import does not permit other encodings to be specified.</p>\r
-<p>Zero or more <tt>filemodify</tt>, <tt>filedelete</tt>, <tt>filename</tt> and\r
-<tt>filedeleteall</tt> commands\r
+<p>Zero or more <tt>filemodify</tt>, <tt>filedelete</tt>, <tt>filecopy</tt>, <tt>filerename</tt>\r
+and <tt>filedeleteall</tt> commands\r
 may be included to update the contents of the branch prior to\r
 creating the commit.  These commands may be supplied in any order.\r
 However it is recommended that a <tt>filedeleteall</tt> command preceed\r
-all <tt>filemodify</tt> and <tt>filerename</tt> commands in the same commit, as\r
-<tt>filedeleteall</tt>\r
+all <tt>filemodify</tt>, <tt>filecopy</tt> and <tt>filerename</tt> commands in the same\r
+commit, as <tt>filedeleteall</tt>\r
 wipes the branch clean (see below).</p>\r
 <h4><tt>author</tt></h4>\r
 <p>An <tt>author</tt> command may optionally appear, if the author information\r
@@ -850,6 +850,23 @@ first non-empty directory or the root is reached.</p>
 <p>here <tt>&lt;path&gt;</tt> is the complete path of the file or subdirectory to\r
 be removed from the branch.\r
 See <tt>filemodify</tt> above for a detailed description of <tt>&lt;path&gt;</tt>.</p>\r
+<h4><tt>filecopy</tt></h4>\r
+<p>Recursively copies an existing file or subdirectory to a different\r
+location within the branch.  The existing file or directory must\r
+exist.  If the destination exists it will be completely replaced\r
+by the content copied from the source.</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>        'C' SP &lt;path&gt; SP &lt;path&gt; LF</tt></pre>\r
+</div></div>\r
+<p>here the first <tt>&lt;path&gt;</tt> is the source location and the second\r
+<tt>&lt;path&gt;</tt> is the destination.  See <tt>filemodify</tt> above for a detailed\r
+description of what <tt>&lt;path&gt;</tt> may look like.  To use a source path\r
+that contains SP the path must be quoted.</p>\r
+<p>A <tt>filecopy</tt> command takes effect immediately.  Once the source\r
+location has been copied to the destination any future commands\r
+applied to the source location will not impact the destination of\r
+the copy.</p>\r
 <h4><tt>filerename</tt></h4>\r
 <p>Renames an existing file or subdirectory to a different location\r
 within the branch.  The existing file or directory must exist. If\r
@@ -866,6 +883,14 @@ that contains SP the path must be quoted.</p>
 location has been renamed to the destination any future commands\r
 applied to the source location will create new files there and not\r
 impact the destination of the rename.</p>\r
+<p>Note that a <tt>filerename</tt> is the same as a <tt>filecopy</tt> followed by a\r
+<tt>filedelete</tt> of the source location.  There is a slight performance\r
+advantage to using <tt>filerename</tt>, but the advantage is so small\r
+that it is never worth trying to convert a delete/add pair in\r
+source material into a rename for fast-import.  This <tt>filerename</tt>\r
+command is provided just to simplify frontends that already have\r
+rename information and don't want bother with decomposing it into a\r
+<tt>filecopy</tt> followed by a <tt>filedelete</tt>.</p>\r
 <h4><tt>filedeleteall</tt></h4>\r
 <p>Included in a <tt>commit</tt> command to remove all files (and also all\r
 directories) from the branch.  This command resets the internal\r
@@ -1223,7 +1248,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 10-Jul-2007 07:49:19 UTC\r
+Last updated 15-Jul-2007 07:18:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fast-import.txt b/git-fast-import.txt
index 80a8ee0f1c37720c632d0df2d628241c1e35938c..30ee98d17f537e289c08d94d9b43728a4b147a34 100644 (file)
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -302,7 +302,7 @@ change to the project.
        data
        ('from' SP <committish> LF)?
        ('merge' SP <committish> LF)?
-       (filemodify | filedelete | filerename | filedeleteall)*
+       (filemodify | filedelete | filecopy | filerename | filedeleteall)*
        LF
 ....
 
@@ -325,13 +325,13 @@ commit message use a 0 length data.  Commit messages are free-form
 and are not interpreted by Git.  Currently they must be encoded in
 UTF-8, as fast-import does not permit other encodings to be specified.
 
-Zero or more `filemodify`, `filedelete`, `filename` and
-`filedeleteall` commands
+Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`
+and `filedeleteall` commands
 may be included to update the contents of the branch prior to
 creating the commit.  These commands may be supplied in any order.
 However it is recommended that a `filedeleteall` command preceed
-all `filemodify` and `filerename` commands in the same commit, as
-`filedeleteall`
+all `filemodify`, `filecopy` and `filerename` commands in the same
+commit, as `filedeleteall`
 wipes the branch clean (see below).
 
 `author`
@@ -497,6 +497,27 @@ here `<path>` is the complete path of the file or subdirectory to
 be removed from the branch.
 See `filemodify` above for a detailed description of `<path>`.
 
+`filecopy`
+^^^^^^^^^^^^
+Recursively copies an existing file or subdirectory to a different
+location within the branch.  The existing file or directory must
+exist.  If the destination exists it will be completely replaced
+by the content copied from the source.
+
+....
+       'C' SP <path> SP <path> LF
+....
+
+here the first `<path>` is the source location and the second
+`<path>` is the destination.  See `filemodify` above for a detailed
+description of what `<path>` may look like.  To use a source path
+that contains SP the path must be quoted.
+
+A `filecopy` command takes effect immediately.  Once the source
+location has been copied to the destination any future commands
+applied to the source location will not impact the destination of
+the copy.
+
 `filerename`
 ^^^^^^^^^^^^
 Renames an existing file or subdirectory to a different location
@@ -517,6 +538,15 @@ location has been renamed to the destination any future commands
 applied to the source location will create new files there and not
 impact the destination of the rename.
 
+Note that a `filerename` is the same as a `filecopy` followed by a
+`filedelete` of the source location.  There is a slight performance
+advantage to using `filerename`, but the advantage is so small
+that it is never worth trying to convert a delete/add pair in
+source material into a rename for fast-import.  This `filerename`
+command is provided just to simplify frontends that already have
+rename information and don't want bother with decomposing it into a
+`filecopy` followed by a `filedelete`.
+
 `filedeleteall`
 ^^^^^^^^^^^^^^^
 Included in a `commit` command to remove all files (and also all