makefile: Add a cscope target

diff --git a/Documentation/config.txt b/Documentation/config.txt
index eebb0b6ba2a2397ee867310d3b9ea4979f7b7510..971fd9f16fba0bf07983a5aa9d016a20e059d7b6 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.