Merge branch 'mm/branch-doc-updates'
commita745a58adeb57107ed884bcc07c915409b9877cb
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jul 2015 21:26:13 +0000 (10 14:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jul 2015 21:26:13 +0000 (10 14:26 -0700)
tree28625a32f45021d31a611982819e4fa834d3f27a
parentb3a30f6e0cb30ebe37381818aec594e99fd380ff
parent83fe16703e3f5c39078db11449fd43f24a8f32f0
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
Documentation/git-branch.txt