diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:27 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:28 -0700 |
commit | d59c12d7ad39f942fc60578ba1e934822f40445b (patch) | |
tree | f0591d6490164e7a8a672c79094a2d612899cfb7 /contrib/fast-import/import-directories.perl | |
parent | 9b30a0339db28e6de9653b5631247d398cce626c (diff) | |
parent | 235e8d591480d7e1378c27fe65c5529625d4b5be (diff) | |
download | git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.gz |
Merge branch 'jl/nor-or-nand-and'
Eradicate mistaken use of "nor" (that is, essentially "nor" used
not in "neither A nor B" ;-)) from in-code comments, command output
strings, and documentations.
* jl/nor-or-nand-and:
code and test: fix misuses of "nor"
comments: fix misuses of "nor"
contrib: fix misuses of "nor"
Documentation: fix misuses of "nor"
Diffstat (limited to 'contrib/fast-import/import-directories.perl')
-rwxr-xr-x | contrib/fast-import/import-directories.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl index 7f3afa5ac4..4dec1f18e4 100755 --- a/contrib/fast-import/import-directories.perl +++ b/contrib/fast-import/import-directories.perl @@ -109,8 +109,8 @@ was available previously is not included in this revision, it will be removed. If an on-disk revision is incomplete, you can point to files from -a previous revision. There are no restriction as to where the source -files are located, nor to the names of them. +a previous revision. There are no restrictions on where the source +files are located, nor on their names. [3.files] ; the key is the path inside the repository, the value is the path |