Merge branch 'ph/rebase-preserve-all-merges'

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index ab3e91c054ca7b4dcf7373b0aac839c18275a791..52d7ae4313389b1766862d3df5d9874a4ac97b36 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -49,6 +49,11 @@ submodule.<name>.update::
        This config option is overridden if 'git submodule update' is given
        the '--merge', '--rebase' or '--checkout' options.
 
+submodule.<name>.branch::
+       A remote branch name for tracking updates in the upstream submodule.
+       If the option is not specified, it defaults to 'master'.  See the
+       `--remote` documentation in linkgit:git-submodule[1] for details.
+
 submodule.<name>.fetchRecurseSubmodules::
        This option can be used to control recursive fetching of this
        submodule. If this option is also present in the submodules entry in