aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-08-22 13:12:12 +0200
committerJunio C Hamano <gitster@pobox.com>2010-08-22 13:26:13 -0700
commit3776ea9d7006f48c380e80ccc57db681f4e9adfb (patch)
treedb2076444c5848b85d72ebbdc127896da7abfe3c
parent5cba1229d8246da2a6d1d956eeed8227f69e185b (diff)
downloadgit-3776ea9d7006f48c380e80ccc57db681f4e9adfb.tar.gz
git-3776ea9d7006f48c380e80ccc57db681f4e9adfb.tar.xz
Typos in code comments, an error message, documentation
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/gitmodules.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0b4011f76..05ec3fed8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1773,7 +1773,7 @@ submodule.<name>.ignore::
Using "none" (the default when this option is not set) also shows
submodules that have untracked files in their work tree as changed.
This setting overrides any setting made in .gitmodules for this submodule,
- 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-submodules" option.
tar.umask::
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 8ae107da2..bcffd95ad 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/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.