Merge branch 'ds/maint-deflatebound'

[git.git] / Documentation / git-merge.txt

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 827838f7d05e21875c9843fd782c4ade1a8b141e..eabd7ef33f6c01322fc3794341c8982573b516a4 100644 (file)
--- 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
 ---------------