diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2007-07-10 07:49:37 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2007-07-10 07:49:37 +0000 |
commit | 06216df5d478e655f4d835b8777e85dffa8bed99 (patch) | |
tree | d052a6c17844293521ea9d9455516f0e51f33f18 /git-fast-import.txt | |
parent | 2a8f6dc6412a0d8c340c73f42533e1d1c5a98118 (diff) | |
download | git-htmldocs-06216df5d478e655f4d835b8777e85dffa8bed99.tar.gz |
Autogenerated HTML docs for v1.5.3-rc0-90-gbaa79
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r-- | git-fast-import.txt | 36 |
1 files changed, 30 insertions, 6 deletions
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 <committish> LF)? ('merge' SP <committish> 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 `<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. @@ -490,9 +493,30 @@ 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 |