diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-11 17:31:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 17:31:08 (GMT) |
| commit | 369dc4081c836bc17ee1debaf6688eb098359760 (patch) | |
| tree | 89e24346a55c464332e169c8e8306669cc03b323 /Documentation/git-log.txt | |
| parent | 62e5e83f8dfc98e182a1ca3a48b2c69f4fd417ce (diff) | |
| parent | fce04c3ca695d32c1b3c59e1bfc1fb4019025c72 (diff) | |
| download | git-369dc4081c836bc17ee1debaf6688eb098359760.zip git-369dc4081c836bc17ee1debaf6688eb098359760.tar.gz git-369dc4081c836bc17ee1debaf6688eb098359760.tar.bz2 | |
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/git-log.txt')
| -rw-r--r-- | Documentation/git-log.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 4a6c47f..32246fd 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]. |