Merge branch 'sg/merge-summary-config'

Doc updates. * sg/merge-summary-config: Documentation: include 'merge.branchdesc' for merge and config as well

Junio C Hamano committed Jun 16, 2015 at 14:27 UTC c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84

No changes.