X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-fmt-merge-msg.txt;h=3a0f55ec8e273545af3a92a9b886511ac79ba73c;hb=8ced9c90a28f6abc80dc5ad4cf7921c2322c0bb0;hp=32aff954a2b2f95a61b39b8d08fb0482724400bb;hpb=7ddd582402aa926d5ec33d914ccc8bfaf1b15c06;p=git.git

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 32aff954a..3a0f55ec8 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