Merge branch 'mj/log-show-signature-conf'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 4a6c47f843a8c0ca0b97a7b30648f7ca37e1f3c4..32246fdb007e9b25f414cff092b9bf0426c55d15 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -198,6 +198,10 @@ log.showRoot::
        `git log -p` output would be shown without a diff attached.
        The default is `true`.
 
+log.showSignature::
+       If `true`, `git log` and related commands will act as if the
+       `--show-signature` option was passed to them.
+
 mailmap.*::
        See linkgit:git-shortlog[1].