Merge branch 'mm/branch-doc-updates' into maint
commit315b3ba3e421f66527a71bbc2e3a7c90e9c6d8e5
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jul 2015 19:21:46 +0000 (27 12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jul 2015 19:21:46 +0000 (27 12:21 -0700)
tree1d9e1c2af033f6a491fba10bbd41bcaa7586be96
parentbde6a72af5b5dc9f1e489c8103ea900e266ab766
parent83fe16703e3f5c39078db11449fd43f24a8f32f0
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
Documentation/git-branch.txt