Merge branch 'mm/branch-doc-updates'

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

diff --cc Documentation/git-branch.txt
Simple merge