X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-fast-import.txt;h=4415e636352ea88f34a798b6c29dc5e34d60d868;hb=60adf7d73e44126289a98dada60f9c335ffc84b0;hp=f56dfcabb96d1510abfd61a13c36135f3824b744;hpb=2cf08b6a0ab09f1b81b78a5686a632a2a602abf4;p=git.git diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index f56dfcabb..4415e6363 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -534,9 +534,6 @@ start with double quote (`"`). If an `LF` or double quote must be encoded into `` shell-style quoting should be used, e.g. `"path/with\n and \" in it"`. -Additionally, in `040000` mode, `` may also be an empty string -(`""`) to specify the root of the tree. - The value of `` must be in canonical form. That is it must not: * contain an empty directory component (e.g. `foo//bar` is invalid), @@ -545,6 +542,8 @@ The value of `` must be in canonical form. That is it must not: * contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid). +The root of the tree can be represented by an empty string as ``. + It is recommended that `` always be encoded using UTF-8. `filedelete` @@ -905,7 +904,7 @@ The `` can be either a mark reference (`:`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written. -output uses the same format as `git cat-file --batch`: +Output uses the same format as `git cat-file --batch`: ==== SP 'blob' SP LF