Merge branch 'maint'

* maint:
Update draft release notes to 1.8.1.5
Documentation/submodule: Add --force to update synopsis

diff --combined Documentation/git-submodule.txt
index a0c9df85f419b319e38c49999f90cdfcc6928799,349378448c5099cadf2bd6a5f5deca57fe03b4ca..c99d795618f59bf98969b551f2a931680534f18e
--- 1/Documentation/git-submodule.txt
--- 2/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@@ -13,8 -13,8 +13,9 @@@ SYNOPSI
              [--reference <repository>] [--] <repository> [<path>]
  'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
  'git submodule' [--quiet] init [--] [<path>...]
- 'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch] [--rebase]
 -'git submodule' [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase]
--            [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
++'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
++            [-f|--force] [--rebase] [--reference <repository>]
++            [--merge] [--recursive] [--] [<path>...]
  'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]
              [commit] [--] [<path>...]
  'git submodule' [--quiet] foreach [--recursive] <command>
@@@ -91,7 -91,7 +92,7 @@@ working directory is used instead
  <path> is the relative location for the cloned submodule to
  exist in the superproject. If <path> does not exist, then the
  submodule is created by cloning from the named URL. If <path> does
 -exist and is already a valid git repository, then this is added
 +exist and is already a valid Git repository, then this is added
  to the changeset without cloning. This second form is provided
  to ease creating a new submodule from scratch, and presumes
  the user will later push the submodule to the given URL.
@@@ -208,8 -208,6 +209,8 @@@ OPTION
  -b::
  --branch::
        Branch of repository to add as submodule.
 +      The name of the branch is recorded as `submodule.<path>.branch` in
 +      `.gitmodules` for `update --remote`.
  
  -f::
  --force::
@@@ -238,27 -236,6 +239,27 @@@
        (the default). This limit only applies to modified submodules. The
        size is always limited to 1 for added/deleted/typechanged submodules.
  
 +--remote::
 +      This option is only valid for the update command.  Instead of using
 +      the superproject's recorded SHA-1 to update the submodule, use the
 +      status of the submodule's remote tracking branch.  The remote used
 +      is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
 +      The remote branch used defaults to `master`, but the branch name may
 +      be overridden by setting the `submodule.<name>.branch` option in
 +      either `.gitmodules` or `.git/config` (with `.git/config` taking
 +      precedence).
 ++
 +This works for any of the supported update procedures (`--checkout`,
 +`--rebase`, etc.).  The only change is the source of the target SHA-1.
 +For example, `submodule update --remote --merge` will merge upstream
 +submodule changes into the submodules, while `submodule update
 +--merge` will merge superproject gitlink changes into the submodules.
 ++
 +In order to ensure a current tracking branch state, `update --remote`
 +fetches the submodule's remote repository before calculating the
 +SHA-1.  If you don't want to fetch, you should use `submodule update
 +--remote --no-fetch`.
 +
  -N::
  --no-fetch::
        This option is only valid for the update command.