diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2015-05-27 23:52:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-28 12:38:46 -0700 |
| commit | fc0aa395f3205a049e917d391e2afa93cda0c8af (patch) | |
| tree | ef6971192c0ed08b494114aec06d2b36a4918581 /Documentation/merge-config.txt | |
| parent | fdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff) | |
| download | git-fc0aa395f3205a049e917d391e2afa93cda0c8af.tar.gz | |
Documentation: include 'merge.branchdesc' for merge and config as wellsg/merge-summary-config
'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>
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index d78d6d854e..a1756efcad 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -26,11 +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 |