From ca779e82c9f263dfdea2a73a4f5494b37bc8aae7 Mon Sep 17 00:00:00 2001 From: Hans Jerry Illikainen Date: Sun, 10 Dec 2017 06:53:57 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/merge-config.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Documentation') diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index df3ea3779..12b6bbf59 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -26,6 +26,10 @@ merge.ff:: allowed (equivalent to giving the `--ff-only` option from the command line). +merge.verifySignatures:: + If true, this is equivalent to the --verify-signatures command + line option. See linkgit:git-merge[1] for details. + include::fmt-merge-msg-config.txt[] merge.renameLimit:: -- cgit v1.2.1