Merge branch 'mg/gpg-fingerprint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 15:53:58 +0000 (00:53 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 15:53:58 +0000 (00:53 +0900)
New "--pretty=format:" placeholders %GF and %GP that show the GPG
key fingerprints have been invented.

* mg/gpg-fingerprint:
  gpg-interface.c: obtain primary key fingerprint as well
  gpg-interface.c: support getting key fingerprint via %GF format
  gpg-interface.c: use flags to determine key/signer info presence

1  2 
gpg-interface.c
pretty.c

diff --cc gpg-interface.c
Simple merge
diff --cc pretty.c
Simple merge