Autogenerated manpages for v1.5.3-rc0-90-gbaa79

diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1
index d3aa94f65879d358b3f1a5f58324cd26f0771640..3d374c1b3c756eb1e5f586b6bf70df18b7a030d3 100644 (file)
--- a/man1/git-fast-import.1
+++ b/man1/git-fast-import.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-FAST\-IMPORT" "1" "06/16/2007" "Git 1.5.2.2.236.g952c8" "Git Manual"
+.TH "GIT\-FAST\-IMPORT" "1" "07/10/2007" "Git 1.5.3.rc0.90.gbaa79" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -131,7 +131,7 @@ Create or update a branch with a new commit, recording one logical change to the
         data
         ('from' SP <committish> LF)?
         ('merge' SP <committish> LF)?
-        (filemodify | filedelete | filedeleteall)*
+        (filemodify | filedelete | filerename | filedeleteall)*
         LF
 .fi
 where <ref> is the name of the branch to make the commit on. Typically branch names are prefixed with refs/heads/ in Git, so importing the CVS branch symbol RELENG\-1_0 would use refs/heads/RELENG\-1_0 for the value of <ref>. The value of <ref> must be a valid refname in Git. As LF is not valid in a Git refname, no quoting or escaping syntax is supported here.
@@ -140,7 +140,7 @@ A mark command may optionally appear, requesting fast\-import to save a referenc
 
 The data command following committer must supply the commit message (see below for data command syntax). To import an empty 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 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 commands in the same commit, as filedeleteall wipes the branch clean (see below).
+Zero or more filemodify, filedelete, filename 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 wipes the branch clean (see below).
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
@@ -278,12 +278,28 @@ It is recommended that <path> always be encoded using UTF\-8.
 .br
 \fBfiledelete\fR
 .RS 3
-Included in a commit command to remove a file from the branch. If the file removal makes its directory empty, the directory will be automatically removed too. This cascades up the tree until the first non\-empty directory or the root is reached.
+Included in a commit command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non\-empty directory or the root is reached.
 .sp
 .nf
         'D' SP <path> LF
 .fi
-here <path> is the complete path of the file to be removed. See filemodify above for a detailed description of <path>.
+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>.
+.RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+\fBfilerename\fR
+.RS 3
+Renames 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 replaced by the source directory.
+.sp
+.nf
+        'R' SP <path> SP <path> LF
+.fi
+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 filerename command takes effect immediately. Once the source 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.
 .RE
 .sp
 .it 1 an-trap