Merge branch 'jc/apply-trailing-blank-removal'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0e206759fd3dcd6c1dd600cf0532676222d52642..53c4ca1d7a0f7441a3ff84d50574efabce5a79f5 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2007,6 +2007,12 @@ submodule.<name>.update::
        URL and other values found in the `.gitmodules` file.  See
        linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
 
+submodule.<name>.branch::
+       The remote branch name for a submodule, used by `git submodule
+       update --remote`.  Set this option to override the value found in
+       the `.gitmodules` file.  See linkgit:git-submodule[1] and
+       linkgit:gitmodules[5] for details.
+
 submodule.<name>.fetchRecurseSubmodules::
        This option can be used to control recursive fetching of this
        submodule. It can be overridden by using the --[no-]recurse-submodules