From: Junio C Hamano 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: https://git.lorimer.id.au/gitweb.git/diff_plain/ebf4fc90da239f1005d2c5b1a4278cfe51430151 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