Merge branch 'mm/branch-doc-updates' into maint

* mm/branch-doc-updates: Documentation/branch: document -M and -D in terms of --force Documentation/branch: document -d --force and -m --force