diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-01-15 20:22:35 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-18 16:51:13 -0800 |
| commit | e5959106d613fe5897ce3e02f573dda266f7c700 (patch) | |
| tree | b7eca1151d3b676f14d70e9ae8872a5cbf956ffd | |
| parent | 5ee5f5a65d5a60cd327f1a4b92ee0f48508f2362 (diff) | |
| download | git-e5959106d613fe5897ce3e02f573dda266f7c700.tar.gz git-e5959106d613fe5897ce3e02f573dda266f7c700.tar.xz | |
Documentation/fast-import: put explanation of M 040000 <dataref> "" in context
Omit needless words ("Additionally ... <path> 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 <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-fast-import.txt | 5 |
1 files changed, 2 insertions, 3 deletions
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 `<path>` shell-style quoting should be used, e.g. `"path/with\n and \" in it"`. -Additionally, in `040000` mode, `<path>` may also be an empty string -(`""`) to specify the root of the tree. - The value of `<path>` 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 `<path>` 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 `<path>`. + It is recommended that `<path>` always be encoded using UTF-8. `filedelete` |