summaryrefslogtreecommitdiff
path: root/revision.c
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 /revision.c
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 'revision.c')
-rw-r--r--revision.c2
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="))