Merge branch 'km/log-showsignature-doc'

* km/log-showsignature-doc:
config.txt: add an entry for log.showSignature

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ab3ed72d341bcd50db2f54924c27f4ed71d44f69..0ea247bdca43227f7c27fefbfa62eb6e56431c25 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2154,6 +2154,10 @@ log.showRoot::
        Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
        normally hide the root commit will now show it. True by default.
 
+log.showSignature::
+       If true, makes linkgit:git-log[1], linkgit:git-show[1], and
+       linkgit:git-whatchanged[1] assume `--show-signature`.
+
 log.mailmap::
        If true, makes linkgit:git-log[1], linkgit:git-show[1], and
        linkgit:git-whatchanged[1] assume `--use-mailmap`.