git-merge: add support for --commit and --no-squash

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 015910f27a450cdaec80f3bfc2679243126736c0..d3c25f30f56c2c26f7ad827455397c2df8105aeb 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -337,6 +337,12 @@ branch.<name>.merge::
        branch.<name>.merge to the desired branch, and use the special setting
        `.` (a period) for branch.<name>.remote.
 
+branch.<name>.mergeoptions::
+       Sets default options for merging into branch <name>. The syntax and
+       supported options are equal to that of gitlink:git-merge[1], but
+       option values containing whitespace characters are currently not
+       supported.
+
 clean.requireForce::
        A boolean to make git-clean do nothing unless given -f or -n.  Defaults
        to false.