diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-10 22:07:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-10 22:07:26 -0800 |
| commit | ed287ab7fa71528e8de288988d1662eebae64002 (patch) | |
| tree | fa8ab5768bfce68c5923b674c13d514942a3954c /Documentation/git-fast-import.txt | |
| parent | bd1fc628b8d456bdaea3e10d435cf1e98bc5d8a8 (diff) | |
| parent | 60fa08ed617dd148a9843bfdef2dfecf2ef60123 (diff) | |
| download | git-ed287ab7fa71528e8de288988d1662eebae64002.tar.gz git-ed287ab7fa71528e8de288988d1662eebae64002.tar.xz | |
Merge branch 'maint'
* maint:
git.el: Retrieve commit log information from .dotest directory.
git.el: Avoid appending a signoff line that is already present.
setup_git_directory_gently: fix off-by-one error
user-manual: install user manual stylesheet with other web documents
user-manual: fix rendering of history diagrams
user-manual: fix missing colon in git-show example
user-manual: fix inconsistent use of pull and merge
user-manual: fix inconsistent example
glossary: fix overoptimistic automatic linking of defined terms
Documentation: s/seperator/separator/
Adjust reflog filemode in shared repository
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | 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 7e3d2b1a9..eaba6fd4c 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -462,7 +462,7 @@ in octal. Git only supports the following modes: In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing). -A `<path>` string must use UNIX-style directory seperators (forward +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 (`"`). @@ -472,8 +472,8 @@ quoting should be used, e.g. `"path/with\n and \" in it"`. The value of `<path>` must be in canoncial form. That is it must not: * contain an empty directory component (e.g. `foo//bar` is invalid), -* end with a directory seperator (e.g. `foo/` is invalid), -* start with a directory seperator (e.g. `/foo` is invalid), +* end with a directory separator (e.g. `foo/` is invalid), +* start with a directory separator (e.g. `/foo` is invalid), * contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid). |