summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-11 10:31:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-11 10:31:08 -0700
commit369dc4081c836bc17ee1debaf6688eb098359760 (patch)
tree89e24346a55c464332e169c8e8306669cc03b323 /Documentation
parentMerge branch 'js/find-commit-subject-ignore-leading-blanks' (diff)
parentlog: add log.showSignature configuration variable (diff)
downloadtgif-369dc4081c836bc17ee1debaf6688eb098359760.tar.xz
Merge branch 'mj/log-show-signature-conf'
"git log" learns log.showSignature configuration variable, and a command line option "--no-show-signature" to countermand it. * mj/log-show-signature-conf: log: add log.showSignature configuration variable log: add "--no-show-signature" command line option t4202: refactor test
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-log.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 4a6c47f843..32246fdb00 100644
--- 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].