git.99rst.org Git - git.git/commit

author	Sebastian Götte <redacted>
	Sun, 31 Mar 2013 16:02:46 +0000 (18:02 +0200)
committer	Junio C Hamano <redacted>
	Mon, 1 Apr 2013 05:38:49 +0000 (22:38 -0700)
commit	eb307ae7bb78ccde4e2ac69f302ccf8834883628
tree	40bed8e400a5208b7c81ff94752133818014da6b	tree \| snapshot
parent	efed0022492b81bf59d29193c4ffe96492dd9e9b	commit \| diff

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

Documentation/merge-options.txt		diff \| blob \| history
builtin/merge.c		diff \| blob \| history
commit.c		diff \| blob \| history
commit.h		diff \| blob \| history
gpg-interface.h		diff \| blob \| history
t/lib-gpg/pubring.gpg		diff \| blob \| history
t/lib-gpg/random_seed		diff \| blob \| history
t/lib-gpg/secring.gpg		diff \| blob \| history
t/lib-gpg/trustdb.gpg		diff \| blob \| history
t/t7612-merge-verify-signatures.sh		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT