projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 95ec6b1) | patch
merge: add config option for verifySignatures
authorHans Jerry Illikainen <hji@dyntopia.com>
Sun, 10 Dec 2017 06:53:57 +0000 (06:53 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Dec 2017 18:51:38 +0000 (10:51 -0800)
commitca779e82c9f263dfdea2a73a4f5494b37bc8aae7
tree7ec371c22e16762da499e79911037ba510acdde8tree | snapshot
parent95ec6b1b3393eb6e26da40c565520a8db9796e9fcommit | diff
merge: add config option for verifySignatures

git merge --verify-signatures can be used to verify that the tip commit
of the branch being merged in is properly signed, but it's cumbersome to
have to specify that every time.

Add a configuration option that enables this behaviour by default, which
can be overridden by --no-verify-signatures.

Signed-off-by: Hans Jerry Illikainen <hji@dyntopia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-config.txt diff | blob | blame | history
builtin/merge.c diff | blob | blame | history
t/t7612-merge-verify-signatures.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.