Merge branch 'bw/submodule-branch-dot-doc'

Recent git allows submodule.<name>.branch to use a special token
"." instead of the branch name; the documentation has been updated
to describe it.

* bw/submodule-branch-dot-doc:
submodules doc: update documentation for "." used for submodule branches

diff --combined Documentation/gitmodules.txt
index 10dcc08ff9977ecd0803915aade4b58a27495bbf,5f50df4079a80d70086bf4a1bf2c6974f4ed5689..8f7c50f330f36f625951db7f4cc4657a31fa7113
--- 1/Documentation/gitmodules.txt
--- 2/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@@ -50,8 -50,11 +50,11 @@@ submodule.<name>.update:
  
  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.
+       If the option is not specified, it defaults to 'master'.  A special
+       value of `.` is used to indicate that the name of the branch in the
+       submodule should be the same name as the current branch in the
+       current repository.  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
@@@ -79,11 -82,6 +82,11 @@@ submodule.<name>.ignore:
        "--ignore-submodule" option. The 'git submodule' commands are not
        affected by this setting.
  
 +submodule.<name>.shallow::
 +      When set to true, a clone of this submodule will be performed as a
 +      shallow clone unless the user explicitly asks for a non-shallow
 +      clone.
 +
  
  EXAMPLES
  --------