From: Jonathan Nieder Date: Sun, 16 Jan 2011 02:22:35 GMT Subject: [PATCH] Documentation/fast-import: put explanation of M 040000 "" in context Message-ID: <20110116022234.GA28452@burratino> In-Reply-To: <1286681415-1831-1-git-send-email-david.barr@cordelta.com> 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 --- A small language tweak. Documentation/git-fast-import.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index f56dfca..e2a46a5 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,9 @@ 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). +In `040000` mode, `` can be the empty string (`""`) +to specify the root of the tree. + It is recommended that `` always be encoded using UTF-8. `filedelete` -- 1.7.4.rc2