summaryrefslogtreecommitdiff
path: root/Documentation/fmt-merge-msg-config.txt
AgeCommit message (Collapse)AuthorFilesLines
2015-05-28Documentation: include 'merge.branchdesc' for merge and config as wellLibravatar SZEDER Gábor1-0/+10
'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>