From: Jonathan Nieder Date: Sun, 16 Jan 2011 02:22:35 +0000 (-0600) Subject: Documentation/fast-import: put explanation of M 040000 "" in context X-Git-Tag: v1.7.4-rc3~6 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e5959106d613fe5897ce3e02f573dda266f7c700;p=git.git Documentation/fast-import: put explanation of M 040000 "" in context Omit needless words ("Additionally ... may also" is redundant). While at it, place the explanation of this special case after the general rules for paths to provide the reader with some context. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index fed48bd72..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`