From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Apr 2013 21:15:16 +0000 (-0700)
Subject: Merge branch 'sg/gpg-sig'
X-Git-Tag: v1.8.3-rc0~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5fec92a7af5c42217f3d1c707191791230bdefc;p=thirdparty%2Fgit.git

Merge branch 'sg/gpg-sig'

Teach "merge/pull" to optionally verify and reject commits that are
not signed properly.

* sg/gpg-sig:
  pretty printing: extend %G? to include 'N' and 'U'
  merge/pull Check for untrusted good GPG signatures
  merge/pull: verify GPG signatures of commits being merged
  commit.c/GPG signature verification: Also look at the first GPG status line
  Move commit GPG signature verification to commit.c
---

d5fec92a7af5c42217f3d1c707191791230bdefc