| commit | fc0aa395f3205a049e917d391e2afa93cda0c8af | |
| author | SZEDER Gábor <szeder@ira.uka.de> | |
| Wed, 27 May 2015 21:52:23 +0000 (27 23:52 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 May 2015 19:38:46 +0000 (28 12:38 -0700) | ||
| tree | ef6971192c0ed08b494114aec06d2b36a4918581 | treesnapshot (tar.gz zip) |
| parent | fdf96a20acf96a6ac538df8113b2aafd6ed71d50 | commitdiff |
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>
'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>
| Documentation/fmt-merge-msg-config.txt | [new file with mode: 0644] | blob |
| Documentation/git-fmt-merge-msg.txt | diffblobblamehistory | |
| Documentation/merge-config.txt | diffblobblamehistory |