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>
git-mirror · Aug 22, 2010 · 3776ea9 · 3776ea9
1 parent 5cba122
commit 3776ea9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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.