Files
git/Documentation
SZEDER Gábor fc0aa395f3 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>
2015-05-28 12:38:46 -07:00
..
2014-11-04 13:14:44 -08:00
2015-01-12 14:06:12 -08:00
2014-11-04 13:14:44 -08:00
2009-04-06 00:27:09 -07:00
2014-04-08 12:00:28 -07:00
2014-11-04 13:14:44 -08:00
2013-09-04 12:23:25 -07:00
2014-11-04 13:14:44 -08:00
2014-11-04 13:14:44 -08:00
2014-11-04 13:14:44 -08:00
2014-11-04 13:14:44 -08:00
2013-05-29 14:23:04 -07:00
2014-11-04 13:14:44 -08:00
2013-10-18 13:50:12 -07:00
2014-11-04 13:14:44 -08:00
2013-04-12 12:00:52 -07:00
2014-11-04 13:14:44 -08:00
2015-01-12 14:06:12 -08:00
2014-11-04 13:14:44 -08:00
2014-11-04 13:14:44 -08:00
2014-11-04 13:14:44 -08:00
2014-10-29 10:07:40 -07:00
2014-11-04 13:14:44 -08:00