diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-29 12:21:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-29 12:21:17 -0800 |
| commit | 8a6a6f4259a7ae3d93471986a4bcf8209c443e57 (patch) | |
| tree | 396b5b35d88eb22f0fff40dad6b916eb1fa3d9b5 /Documentation | |
| parent | e7551a80605cf4287ca3542e23dcad8d8d636a27 (diff) | |
| parent | 7c65b2ebb72fcf9b563be3367a088256757343a6 (diff) | |
| download | git-8a6a6f4259a7ae3d93471986a4bcf8209c443e57.tar.gz | |
Merge branch 'maint'
* maint:
git-fast-import.txt: improve documentation for quoted paths
git-remote-mediawiki: escape ", \, and LF in file names
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-import.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 959e4d3aee..d1844ead4a 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -562,8 +562,12 @@ A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not 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"`. +A path can use C-style string quoting; this is accepted in all cases +and mandatory if the filename starts with double quote or contains +`LF`. In C-style quoting, the complete name should be surrounded with +double quotes, and any `LF`, backslash, or double quote characters +must be escaped by preceding them with a backslash (e.g., +`"path/with\n, \\ and \" in it"`). The value of `<path>` must be in canonical form. That is it must not: |