Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 63aa694968c4e98643ef7b8c3b976a14151fd9e2..2502531a3dfd0cee67f6d1d9fc1db1d69cf20e30 100644 (file)
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -218,7 +218,7 @@ OPTIONS
        This option is only valid for the update command.
        Rebase the current branch onto the commit recorded in the
        superproject. If this option is given, the submodule's HEAD will not
-       be detached. If a a merge failure prevents this process, you will have
+       be detached. If a merge failure prevents this process, you will have
        to resolve these failures with linkgit:git-rebase[1].
        If the key `submodule.$name.update` is set to `rebase`, this option is
        implicit.