summaryrefslogtreecommitdiffstats
path: root/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-03-12 07:29:20 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-03-12 07:29:20 +0000
commitc51fede9f2fdd66e06416d7865b023924b52e659 (patch)
tree19a562e90847738d119806fae209a948d74e0107 /git-fast-import.txt
parentd15328acbacd5d5b1b56a7ee143ccf7db9e7549e (diff)
downloadgit-htmldocs-c51fede9f2fdd66e06416d7865b023924b52e659.tar.gz
Autogenerated HTML docs for v1.5.0.3-382-g34572
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r--git-fast-import.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt
index 7e3d2b1a9..eaba6fd4c 100644
--- a/git-fast-import.txt
+++ b/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).