Merge branch 'dd/find-graft-with-sha1-pos'

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 385f35da59c6a1e0ce31b869e2b0bd199bb3074d..f539e3f66a8b4c9b2603b0e2f63a89dd2adf1bfe 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -35,6 +35,8 @@ submodule.<name>.url::
        linkgit:git-clone[1] or (if it begins with ./ or ../) a location
        relative to the superproject's origin repository.
 
+In addition, there are a number of optional keys:
+
 submodule.<name>.update::
        Defines what to do when the submodule is updated by the superproject.
        If 'checkout' (the default), the new commit specified in the