summaryrefslogtreecommitdiffstats
path: root/gitmodules.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-08-23 17:10:18 +0000
committerJunio C Hamano <junio@kernel.org>2010-08-23 17:10:18 +0000
commitde9745c4705d1abe0983cf9aba9af20936c18eb5 (patch)
tree4b77490aa70b331bb985d610a049da56f89c1136 /gitmodules.txt
parent53ba6d09f50a1b19d435ff87db9145c7be66ef5d (diff)
downloadgit-htmldocs-de9745c4705d1abe0983cf9aba9af20936c18eb5.tar.gz
Autogenerated HTML docs for v1.7.2.2-165-gbc38
Diffstat (limited to 'gitmodules.txt')
-rw-r--r--gitmodules.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitmodules.txt b/gitmodules.txt
index 8ae107da2..bcffd95ad 100644
--- a/gitmodules.txt
+++ b/gitmodules.txt
@@ -56,7 +56,7 @@ submodule.<name>.ignore::
If this option is also present in the submodules entry in .git/config of
the superproject, the setting there will override the one found in
.gitmodules.
- Both settings can be overriden on the command line by using the
+ Both settings can be overridden on the command line by using the
"--ignore-submodule" option.