tree ef6971192c0ed08b494114aec06d2b36a4918581
parent fdf96a20acf96a6ac538df8113b2aafd6ed71d50
author SZEDER Gábor <szeder@ira.uka.de> 1432763543 +0200
committer Junio C Hamano <gitster@pobox.com> 1432841926 -0700

Documentation: include 'merge.branchdesc' for merge and config as well

'merge.branchdesc' is only mentioned in the docs of 'git fmt-merge-msg'.

The description of 'merge.log' is already duplicated between
'merge-config.txt' and 'git-fmt-merge-msg.txt'; instead of duplicating the
description of another config variable, extract the descriptions of both
of these variables from 'git-fmt-merge-msg.txt' into a separate file and
include it there and in 'merge-config.txt'.

Leave 'merge.summary' only in git-fmt-merge-msg.txt, as it is marked
as deprecated.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>