summaryrefslogtreecommitdiffstats
path: root/gitignore.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-09-30 00:51:14 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-09-30 00:51:14 +0000
commit4fd58d46def7aad5dd382cd20768c4cfcd51aba8 (patch)
treeb22aa7ccfa99b7648da1bb9cf033556cf0b28662 /gitignore.txt
parente59a0072cf9a106b3fd372b42531d9338e668409 (diff)
downloadgit-htmldocs-4fd58d46def7aad5dd382cd20768c4cfcd51aba8.tar.gz
Autogenerated HTML docs for v1.5.3.3-114-g2a85
Diffstat (limited to 'gitignore.txt')
-rw-r--r--gitignore.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitignore.txt b/gitignore.txt
index 9c8309569..e8b8581f5 100644
--- a/gitignore.txt
+++ b/gitignore.txt
@@ -26,7 +26,7 @@ precedence, the last matching pattern decides the outcome):
* Patterns read from a `.gitignore` file in the same directory
as the path, or in any parent directory, with patterns in the
- higher level files (up to the root) being overriden by those in
+ higher level files (up to the root) being overridden by those in
lower level files down to the directory containing the file.
These patterns match relative to the location of the
`.gitignore` file. A project normally includes such