global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-17 20:20:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  exec_cmd: remove unused extern
  Documentation/fast-import: put explanation of M 040000 <dataref> "" in context
  svndump.c: Fix a printf format compiler warning
This commit is contained in:
Junio C Hamano
2011-01-19 08:34:19 -08:00
parent 90603894a1 b20e9b0b52
commit 0dd9806a65
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-fast-import.txt
View File

@@ -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`