summaryrefslogtreecommitdiffstats
path: root/gitmodules.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-01-04 22:06:18 +0000
committerJunio C Hamano <junio@kernel.org>2011-01-04 22:06:18 +0000
commit7165bf798c79fef70904e15d0d487e713bd25ac1 (patch)
tree3f1e20a921f1bb3f3dc8350d2716405b634964a4 /gitmodules.txt
parent3609b339c5cf80a09d3c619ae11c8263463f361c (diff)
downloadgit-htmldocs-7165bf798c79fef70904e15d0d487e713bd25ac1.tar.gz
Autogenerated HTML docs for v1.7.4-rc0-5-gf2665
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 6c93202e7..68977943e 100644
--- a/gitmodules.txt
+++ b/gitmodules.txt
@@ -49,7 +49,7 @@ submodule.<name>.fetchRecurseSubmodules::
submodule. 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
"--[no-]recurse-submodules" option to "git fetch" and "git pull"..
submodule.<name>.ignore::