Merge branch 'tr/send-email-refuse-sending-unedited-cover-letter'

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 8ae107da250ff01b17b5215a474c781a0f0ae57a..bcffd95ada574a8fb3c6e62e539e736a17170414 100644 (file)
--- 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.