diff options
author | Sebastian Götte <jaseg@physik.tu-berlin.de> | 2013-03-31 18:02:24 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-03-31 19:23:59 -0700 |
commit | efed0022492b81bf59d29193c4ffe96492dd9e9b (patch) | |
tree | 51a16967d90213fc5746c590dbd49c4193d5b20d /builtin/merge-recursive.c | |
parent | commit.c/GPG signature verification: Also look at the first GPG status line (diff) | |
download | tgif-efed0022492b81bf59d29193c4ffe96492dd9e9b.tar.xz |
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>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions