]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f8aae8d) | patch
merge/pull: verify GPG signatures of commits being merged
authorSebastian Götte <jaseg@physik.tu-berlin.de>
Sun, 31 Mar 2013 16:02:24 +0000 (18:02 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 02:23:59 +0000 (19:23 -0700)
commitefed0022492b81bf59d29193c4ffe96492dd9e9b
tree51a16967d90213fc5746c590dbd49c4193d5b20dtree | snapshot
parentf8aae8d0efccd268babd482f10709b4f86a9f32ecommit | diff
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>
Documentation/merge-options.txt diff | blob | blame | history
builtin/merge.c diff | blob | blame | history
git-pull.sh diff | blob | blame | history
t/t7612-merge-verify-signatures.sh [new file with mode: 0755] blob
Unnamed repository; edit this file 'description' to name the repository.