]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b72ec5 e290c4b)
Merge branch 'sg/gpg-sig'
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Apr 2013 21:15:16 +0000 (14:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Apr 2013 21:15:16 +0000 (14:15 -0700)
commitd5fec92a7af5c42217f3d1c707191791230bdefc
tree772e89712d4247cae1c934408e4af0e6862e8914tree | snapshot
parent7b72ec5e14656af2d48c7a2a0b7251c35903bbafcommit | diff
parente290c4b944f109aff26cc3db4ae0aec92f3cc126commit | diff
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
Documentation/merge-options.txt diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.