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>
SZEDER Gábor committed
May 27, 2015 at 23:52 UTC
fc0aa395f3205a049e917d391e2afa93cda0c8af
3 files changed
+12
-16
Documentation/fmt-merge-msg-config.txt
new
+10
@@ -0,0 +1,10 @@
1
+merge.branchdesc::
2
+ In addition to branch names, populate the log message with
3
+ the branch description text associated with them. Defaults
4
+ to false.
5
+
6
+merge.log::
7
+ In addition to branch names, populate the log message with at
8
+ most the specified number of one-line descriptions from the
9
+ actual commits that are being merged. Defaults to false, and
10
+ true is a synonym for 20.
Documentation/git-fmt-merge-msg.txt
+1
-11
@@ -51,17 +51,7 @@ OPTIONS
51
52
CONFIGURATION
53
-------------
54
-
55
-merge.branchdesc::
56
- In addition to branch names, populate the log message with
57
- the branch description text associated with them. Defaults
58
- to false.
59
-
60
-merge.log::
61
- In addition to branch names, populate the log message with at
62
- most the specified number of one-line descriptions from the
63
- actual commits that are being merged. Defaults to false, and
64
- true is a synonym for 20.
54
+include::fmt-merge-msg-config.txt[]
55
56
merge.summary::
57
Synonym to `merge.log`; this is deprecated and will be removed in
Documentation/merge-config.txt
+1
-5
@@ -26,11 +26,7 @@ merge.ff::
26
allowed (equivalent to giving the `--ff-only` option from the
27
command line).
28
29
-merge.log::
30
- In addition to branch names, populate the log message with at
31
- most the specified number of one-line descriptions from the
32
- actual commits that are being merged. Defaults to false, and
33
- true is a synonym for 20.
29
+include::fmt-merge-msg-config.txt[]
30
31
merge.renameLimit::
32
The number of files to consider when performing rename detection