Merge branch 'cb/send-email-help'

[git.git] / Documentation / gitmodules.txt

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 15a218655970de61781e1b2793576a05b0fac7b2..4040941e55e88114b70d3d0ae7ecb644794fc8b3 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -45,12 +45,12 @@ submodule.<name>.update::
        the '--merge' or '--rebase' options.
 
 submodule.<name>.fetchRecurseSubmodules::
        the '--merge' or '--rebase' options.
 
 submodule.<name>.fetchRecurseSubmodules::

-       This option can be used to enable/disable recursive fetching of this
+       This option can be used to control recursive fetching of this

        submodule. 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 overridden on the command line by using the
        submodule. 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 overridden on the command line by using the

-       "--[no-]recurse-submodules" option to "git fetch" and "git pull"..
+       "--[no-]recurse-submodules" option to "git fetch" and "git pull".

 
 submodule.<name>.ignore::
        Defines under what circumstances "git status" and the diff family show
 
 submodule.<name>.ignore::
        Defines under what circumstances "git status" and the diff family show