diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:31:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:31:08 -0700 |
| commit | 369dc4081c836bc17ee1debaf6688eb098359760 (patch) | |
| tree | 89e24346a55c464332e169c8e8306669cc03b323 /revision.c | |
| parent | 62e5e83f8dfc98e182a1ca3a48b2c69f4fd417ce (diff) | |
| parent | fce04c3ca695d32c1b3c59e1bfc1fb4019025c72 (diff) | |
| download | git-369dc4081c836bc17ee1debaf6688eb098359760.tar.gz | |
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 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 2f60062876..edba5b79bc 100644 --- a/revision.c +++ b/revision.c @@ -1871,6 +1871,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->notes_opt.use_default_notes = 1; } else if (!strcmp(arg, "--show-signature")) { revs->show_signature = 1; + } else if (!strcmp(arg, "--no-show-signature")) { + revs->show_signature = 0; } else if (!strcmp(arg, "--show-linear-break") || starts_with(arg, "--show-linear-break=")) { if (starts_with(arg, "--show-linear-break=")) |