Merge branch 'js/win32-mmap'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d29665666beac20eef3e98fde4682ca947f840fb..42d2b50477b2863c2d0d93b1e80d70cf85bc5451 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2744,6 +2744,11 @@ submodule.fetchJobs::
        in parallel. A value of 0 will give some reasonable default.
        If unset, it defaults to 1.
 
+tag.forceSignAnnotated::
+       A boolean to specify whether annotated tags created should be GPG signed.
+       If `--annotate` is specified on the command line, it takes
+       precedence over this option.
+
 tag.sort::
        This variable controls the sort ordering of tags when displayed by
        linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the