From: Junio C Hamano Date: Thu, 23 Feb 2012 19:20:15 +0000 (-0800) Subject: Document merge.branchdesc configuration variable X-Git-Tag: v1.7.9.3~36 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8c80ff362f1f4e586a37fba8e6dc83eee67aa2b5?hp=--cc 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 --- 8c80ff362f1f4e586a37fba8e6dc83eee67aa2b5 diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 32aff954a2..3a0f55ec8e 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -53,6 +53,11 @@ 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