X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=bca4212e565c95f79a76a14cc4444e72e472a22c;hb=9ff74e95da5605778bdc7567ae63d70c96e6bed4;hp=144bc16ff26bbf1d311482e6be15fc034994ce49;hpb=e92ea62425fb89713bc47241af29a79f5f191cc6;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 144bc16ff..bca4212e5 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -56,8 +56,12 @@ merge.verbosity::
 	message if conflicts were detected. Level 1 outputs only
 	conflicts, 2 outputs conflicts and file changes.  Level 5 and
 	above outputs debugging information.  The default is level 2.
-	Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
+	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
 ---------------