From: Junio C Hamano Date: Tue, 10 Jul 2007 07:49:37 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3-rc0-90-gbaa79 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06216df5d478e655f4d835b8777e85dffa8bed99;p=git.git Autogenerated HTML docs for v1.5.3-rc0-90-gbaa79 --- diff --git a/git-fast-import.html b/git-fast-import.html index 1d0ce26cd..760cecf21 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -633,7 +633,7 @@ change to the project.

data ('from' SP <committish> LF)? ('merge' SP <committish> LF)? - (filemodify | filedelete | filedeleteall)* + (filemodify | filedelete | filerename | filedeleteall)* LF

where <ref> is the name of the branch to make the commit on. @@ -652,11 +652,13 @@ 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 +

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 commands in the same commit, as filedeleteall +all filemodify and filerename commands in the same commit, as +filedeleteall wipes the branch clean (see below).

author

An author command may optionally appear, if the author information @@ -836,16 +838,34 @@ contain the special component . or .. (e.g. foo/./bar

It is recommended that <path> always be encoded using UTF-8.

filedelete

-

Included in a commit command to remove a file from the branch. -If the file removal makes its directory empty, the directory will +

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.

        'D' SP <path> LF
-

here <path> is the complete path of the file to be removed. +

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>.

+

filerename

+

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.

+
+
+
        'R' 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 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.

filedeleteall

Included in a commit command to remove all files (and also all directories) from the branch. This command resets the internal @@ -1203,7 +1223,7 @@ memory footprint (less than 2.7 MiB per active branch).

diff --git a/git-fast-import.txt b/git-fast-import.txt index 5eacab08d..80a8ee0f1 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -302,7 +302,7 @@ change to the project. data ('from' SP LF)? ('merge' SP LF)? - (filemodify | filedelete | filedeleteall)* + (filemodify | filedelete | filerename | filedeleteall)* LF .... @@ -325,11 +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` and `filedeleteall` commands +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` commands in the same commit, as `filedeleteall` +all `filemodify` and `filerename` commands in the same commit, as +`filedeleteall` wipes the branch clean (see below). `author` @@ -481,8 +483,9 @@ It is recommended that `` always be encoded using UTF-8. `filedelete` ^^^^^^^^^^^^ -Included in a `commit` command to remove a file from the branch. -If the file removal makes its directory empty, the directory will +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. @@ -490,9 +493,30 @@ first non-empty directory or the root is reached. 'D' SP LF .... -here `` is the complete path of the file to be removed. +here `` is the complete path of the file or subdirectory to +be removed from the branch. See `filemodify` above for a detailed description of ``. +`filerename` +^^^^^^^^^^^^ +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. + +.... + 'R' SP SP LF +.... + +here the first `` is the source location and the second +`` is the destination. See `filemodify` above for a detailed +description of what `` 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. + `filedeleteall` ^^^^^^^^^^^^^^^ Included in a `commit` command to remove all files (and also all