Merge branch 'maint-1.6.3' into maint

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 1b67f0a9f12974afca2e8e6948d0fca564b9b17b..5daf750d1942f3b97844b4ef378daf9346cb46d4 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -35,9 +35,11 @@ submodule.<name>.update::
        If 'checkout' (the default), the new commit specified in the
        superproject will be checked out in the submodule on a detached HEAD.
        If 'rebase', the current branch of the submodule will be rebased onto
-       the commit specified in the superproject.
+       the commit specified in the superproject. If 'merge', the commit
+       specified in the superproject will be merged into the current branch
+       in the submodule.
        This config option is overridden if 'git submodule update' is given
-       the '--rebase' option.
+       the '--merge' or '--rebase' options.
 
 
 EXAMPLES