]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mj/log-show-signature-conf'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:31:08 +0000 (10:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:31:08 +0000 (10:31 -0700)
"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

1  2 
Documentation/git-log.txt
builtin/log.c
revision.c

Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc revision.c
Simple merge