2 commits

Author	SHA1	Message	Date
Sebastian Götte	eb307ae7bb	merge/pull Check for untrusted good GPG signatures ... When --verify-signatures is specified, abort the merge in case a good GPG signature from an untrusted key is encountered. Signed-off-by: Sebastian Götte <jaseg@physik-pool.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2013-03-31 22:38:49 -07:00
Sebastian Götte	efed002249	merge/pull: verify GPG signatures of commits being merged ... When --verify-signatures is specified on the command-line of git-merge or git-pull, check whether the commits being merged have good gpg signatures and abort the merge in case they do not. This allows e.g. auto-deployment from untrusted repo hosts. Signed-off-by: Sebastian Götte <jaseg@physik-pool.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2013-03-31 19:23:59 -07:00