Document merge.branchdesc configuration variable
This was part of the "branch description" feature in the larger "help people communicate better during their pull based workflow" topic, but was never documented. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Feb 23, 2012 at 11:20 UTC
8c80ff362f1f4e586a37fba8e6dc83eee67aa2b5
1 file changed
+5
Documentation/git-fmt-merge-msg.txt
+5
@@ -53,6 +53,11 @@ OPTIONS
53
CONFIGURATION
54
-------------
55
56
+merge.branchdesc::
57
+ In addition to branch names, populate the log message with
58
+ the branch description text associated with them. Defaults
59
+ to false.
60
+
61
merge.log::
62
In addition to branch names, populate the log message with at
63
most the specified number of one-line descriptions from the