From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Jun 2015 21:27:05 +0000 (-0700)
Subject: Merge branch 'sg/merge-summary-config'
X-Git-Tag: v2.5.0-rc0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84;p=thirdparty%2Fgit.git

Merge branch 'sg/merge-summary-config'

Doc updates.

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

c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84