X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=eabd7ef33f6c01322fc3794341c8982573b516a4;hb=03800743156fe4f331a10c0983b9d633bed3a687;hp=827838f7d05e21875c9843fd782c4ade1a8b141e;hpb=dee48c3c7ed7f7a32a524e8a492c6bc4e3c1c78d;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 827838f7d..eabd7ef33 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -59,6 +59,10 @@ merge.verbosity::
 	above outputs debugging information.  The default is level 2.
 	Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
 
+branch.<name>.mergeoptions::
+	Sets default options for merging into branch <name>. The syntax and
+	supported options are equal to that of git-merge, but option values
+	containing whitespace characters are currently not supported.
 
 HOW MERGE WORKS
 ---------------