From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jun 2015 18:02:16 +0000 (-0700)
Subject: Merge branch 'sg/merge-summary-config' into maint
X-Git-Tag: v2.4.5~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebf4fc90da239f1005d2c5b1a4278cfe51430151;p=thirdparty%2Fgit.git

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

Doc updates.

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

ebf4fc90da239f1005d2c5b1a4278cfe51430151