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: https://git.lorimer.id.au/gitweb.git/diff_plain/ebf4fc90da239f1005d2c5b1a4278cfe51430151?ds=inline;hp=-c

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
diff --combined Documentation/merge-config.txt
index 8a0e52f8ee,a1756efcad..002ca58c21
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@@ -1,4 -1,4 +1,4 @@@
 -merge.conflictstyle::
 +merge.conflictStyle::
  	Specify the style in which conflicted hunks are written out to
  	working tree files upon merge.  The default is "merge", which
  	shows a `<<<<<<<` conflict marker, changes made by one side,
@@@ -26,11 -26,7 +26,7 @@@ merge.ff:
  	allowed (equivalent to giving the `--ff-only` option from the
  	command line).
  
- merge.log::
- 	In addition to branch names, populate the log message with at
- 	most the specified number of one-line descriptions from the
- 	actual commits that are being merged.  Defaults to false, and
- 	true is a synonym for 20.
+ include::fmt-merge-msg-config.txt[]
  
  merge.renameLimit::
  	The number of files to consider when performing rename detection