tree fbbf73c27da9cda04725eb7f5b21432db8622b93
parent 5fd72277d468ecf6b5685dbff14e8a4b2de8eb77
parent fc0aa395f3205a049e917d391e2afa93cda0c8af
author Junio C Hamano <gitster@pobox.com> 1435255336 -0700
committer Junio C Hamano <gitster@pobox.com> 1435255337 -0700

Merge branch 'sg/merge-summary-config' into maint

Doc updates.

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