summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2015-05-27 21:52:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-28 19:38:46 (GMT)
commitfc0aa395f3205a049e917d391e2afa93cda0c8af (patch)
treeef6971192c0ed08b494114aec06d2b36a4918581 /Documentation/git-fmt-merge-msg.txt
parentfdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff)
downloadgit-fc0aa395f3205a049e917d391e2afa93cda0c8af.zip
git-fc0aa395f3205a049e917d391e2afa93cda0c8af.tar.gz
git-fc0aa395f3205a049e917d391e2afa93cda0c8af.tar.bz2
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>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
-rw-r--r--Documentation/git-fmt-merge-msg.txt12
1 files changed, 1 insertions, 11 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index bb1232a..55a9a4b 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -51,17 +51,7 @@ OPTIONS
CONFIGURATION
-------------
-
-merge.branchdesc::
- In addition to branch names, populate the log message with
- the branch description text associated with them. Defaults
- to false.
-
-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.summary::
Synonym to `merge.log`; this is deprecated and will be removed in