Merge branch 'maint'

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

diff --cc 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>